Cancel game progress spinner

lindlof · Dec 6, 2020 · bee3605 · bee3605
1 parent 2abb9e7
commit bee3605
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 17 deletions.
diff --git a/web/src/App.tsx b/web/src/App.tsx
@@ -45,7 +45,7 @@ export const App: React.FC = () => {
               playHandsign(client, game, handsign, setGame, enqueueSnackbar)
             }
             leaveGame={() => setGame(undefined)}
-            claimInactivity={() => claimInactivity(client, game, setGame, enqueueSnackbar)}
+            claimInactivity={async () => setGame(await Game.claimInactivity(client, game))}
             enqueueSnackbar={enqueueSnackbar}
           />
         </GameTicker>
@@ -137,17 +137,4 @@ const playHandsign = async (
   }
 };
 
-const claimInactivity = async (
-  client: SecretJS.SigningCosmWasmClient,
-  game: Game.Game,
-  setGame: Function,
-  enqueueSnackbar: Function,
-): Promise<void> => {
-  try {
-    setGame(await Game.claimInactivity(client, game));
-  } catch (error) {
-    enqueueSnackbar('Secret error', { variant: 'error' });
-  }
-};
-
 export default App;
diff --git a/web/src/GamePlaying.tsx b/web/src/GamePlaying.tsx
@@ -70,6 +70,7 @@ export default (props: Props) => {
     try {
       await claimInactivity();
     } catch {
+      enqueueSnackbar('Secret error', { variant: 'error' });
       setClaimingInactivity(false);
     }
   };
@@ -122,9 +123,13 @@ export default (props: Props) => {
           )}
           <Grid item>
             <Typography>Waiting for other player</Typography>
-            <Button variant="contained" color="primary" onClick={tryClaimInactivity}>
-              Cancel game
-            </Button>
+            {claimingInactivity ? (
+              <CircularProgress />
+            ) : (
+              <Button variant="contained" color="primary" onClick={tryClaimInactivity}>
+                Cancel game
+              </Button>
+            )}
           </Grid>
         </Grid>
       </Container>