Gym battle bugs??

Okay so there's this consistant problem I face with certain gyms where after the first 2 attacks in a battle (not raid) the game will give me a network error and just time down the battle all while the enemy mon just sandbags all the attacks. Now after the time runs out nothing happens until I leave them it tells me the battle was already complete and after I try going back to the gym the game gets stuck in the screen below.
Now from my 25 min experience with this situation whilst waiting for the bus I've caught pokemon in between trying to battle without any problems evolved some to wake around a lil bit all fine so I know it's not my internet or connection with the game so I am wondering if anyone else has faced this problem and their solution or quick fix to this.

This seems like it might be another bug that randomly happens. Like after knocking out a pokemon, starting the next battle. and then leaving (in that order) then going to your items healing changing up your team positions or who was first to another mon but keeping them in the same team when starting the gym battle again will cause the battle to pick up where it left off with all your mons having the same hp as when you last battled (even after healing) I know cause I've lost 20+ super and hyper potions due to this. Not super bad but still probably shouldn't be happening.

Niantic pls fix