Fixing bug whereby the game was resetting in an infinite loop

daithihearn · Feb 2, 2023 · c01daac · c01daac
1 parent fa7b86c
commit c01daac
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/pages/Game/Game.tsx b/src/pages/Game/Game.tsx
@@ -38,18 +38,20 @@ const Game = () => {
         await dispatch(GameService.getAllPlayers()).catch((e: Error) =>
             enqueueSnackbar(parseError(e), { variant: "error" }),
         )
-    }, [iamSpectator])
+    }, [id, iamSpectator])
 
     useEffect(() => {
         fetchData()
+    }, [id, iamSpectator])
 
+    useEffect(() => {
         return () => {
-            console.log("Resetting game")
-            dispatch(resetGame())
+            console.log("Clearing game")
             dispatch(clearMyCards())
             dispatch(clearAutoPlay())
+            dispatch(resetGame())
         }
-    }, [id, iamSpectator])
+    }, [])
 
     return (
         <PullToRefresh