 Took my phone to ubreakifix as it's a Samsung authorized repair center. Got a new battery yesterday for my s7 to extend the life of the phone
 They actually did an amazing job