fix play

Author: Await-0x

client/src/api/indexer.js

@@ -292,7 +292,7 @@ export const useIndexer = () => {
       let games = gamesData.map((game) => {
         let gameData = gameEvents.find(
           (event) =>
-            parseInt(event.game_id, 16) === game.game_id
+            parseInt(event.game_id, 16) === game.token_id
         );
 
         let tokenId = game.token_id;

client/src/container/LoadingContainer.jsx

@@ -130,7 +130,7 @@ function LoadingContainer() {
       }
 
       gameContext.setGame({
-        gameId: data.game_id,
+        gameId: tokenData.id,
         state: data.state,
 
         playerName: tokenData.playerName,

client/src/contexts/dojoContext.jsx

@@ -6,6 +6,7 @@ import { CallData, RpcProvider } from 'starknet';
 import { VRF_PROVIDER_ADDRESS } from "../helpers/constants";
 import { translateEvent } from "../helpers/events";
 import { useDynamicConnector } from "./starknet";
+import { delay } from "../helpers/utilities";
 
 export const DojoContext = createContext()
 
@@ -43,7 +44,6 @@ export const DojoProvider = ({ children }) => {
 
     if (includeVRF) {
       let contractAddress = txs[txs.length - 1].contractAddress
-
       txs.unshift({
         contractAddress: VRF_PROVIDER_ADDRESS,
         entrypoint: 'request_random',
@@ -56,8 +56,8 @@ export const DojoProvider = ({ children }) => {
 
     try {
       const tx = await account.execute(txs);
-      await new Promise(resolve => setTimeout(resolve, 1000));
-      const receipt = await account.waitForTransaction(tx.transaction_hash, { retryInterval: 500 })
+      await delay(1000);
+      const receipt = await waitForTransaction(tx.transaction_hash, 0)
 
       if (receipt.execution_status === "REVERTED") {
         console.log('contract error', receipt)
@@ -78,6 +78,25 @@ export const DojoProvider = ({ children }) => {
     }
   }
 
+  const waitForTransaction = async (txHash, retries) => {
+    if (retries > 9) {
+      throw new Error("Transaction failed");
+    }
+
+    try {
+      const receipt = await account.waitForTransaction(
+        txHash,
+        { retryInterval: 500 }
+      );
+
+      return receipt;
+    } catch (error) {
+      console.error("Error waiting for transaction :", error);
+      await delay(500);
+      return waitForTransaction(txHash, retries + 1);
+    }
+  }
+
   return (
     <DojoContext.Provider
       value={{

client/src/contexts/draftContext.jsx

@@ -47,7 +47,7 @@ export const DraftProvider = ({ children }) => {
     })
 
     game.setLoadingProgress(99)
-    const res = await dojo.executeTx(txs, true)
+    const res = await dojo.executeTx(txs, false)
 
     if (res) {
       const gameValues = res.find(e => e.componentName === 'Game')

client/src/contexts/gameContext.jsx

@@ -59,15 +59,10 @@ export const GameProvider = ({ children }) => {
   useEffect(() => {
     if (values.gameId) {
       setLoading(false);
+      window.history.replaceState(null, '', `/play/${values.gameId}`)
     }
   }, [values.gameId])
 
-  useEffect(() => {
-    if (values.gameId && GG_questMode) {
-      setValues(prev => ({ ...prev, questTarget: GG_questTargetScore }))
-    }
-  }, [GG_questMode, values.gameId, GG_questTargetScore])
-
   const setGame = (values) => {
     if (!isNaN(values.state || 0)) {
       values.state = GAME_STATES[values.state]

client/src/contexts/replayContext.jsx

@@ -60,7 +60,6 @@ export const ReplayProvider = ({ children }) => {
 
   const startReplay = async (_game) => {
     setLoadingReplay(true)
-    navigate('/watch/' + _game.id)
 
     let txs = await getGameTxs(_game.id)
     await game.actions.loadGameDetails(_game)

client/src/pages/ArenaPage.jsx

@@ -44,7 +44,6 @@ function ArenaPage() {
       gameContext.setLoadingProgress(10)
 
       let game = await getTokenMetadata(watchGameId)
-
       if (game) {
         replay.startReplay(game)
       } else {