feat: wrapp App #190

chainhackers · Aug 23, 2023 · d2e56c1 · d2e56c1
1 parent cd16363
commit d2e56c1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/components/GameResult/GameResult.tsx b/components/GameResult/GameResult.tsx
@@ -12,18 +12,19 @@ import { BlockPayedGame, CustomButton, PurpleIcon, WhiteIcon } from 'components/
 import { ScoreCard } from 'components/GameResult/ScoreCard/index';
 import { TeamMemberBasic } from 'components/shared/ui/TeamMemberBasic';
 import { OIcon, XIcon } from 'components/shared/ui/XOIcons';
-import {useContext, useEffect, useState} from 'react';
+import { useEffect, useState } from 'react';
 import { FinishedGameState } from 'gameApi';
-import {GameStateContext, IGameStateContext,} from "../../contexts/GameStateContext";
+import {IGameStateContext, useGameStateContext} from "../../contexts/GameStateContext";
 export const GameResult= () => {
   const [countContextFinishResult, setCountContextFinishResult] = useState(0);
-  const { finishResult } = useContext(GameStateContext);
+  const gameStateContext = useGameStateContext();
+  const { finishResult } = gameStateContext;
 
   useEffect(() => {
     setCountContextFinishResult(prevCount => prevCount + 1);
   }, [finishResult]);
 
-  console.log('Контекст в компоненте GameResult:', GameStateContext);
+  console.log('Контекст в компоненте GameResult:', gameStateContext);
   console.log('Данные из контекста в GameResult:', finishResult);
   console.log('Счетчик обновлений данных:', countContextFinishResult);
 

diff --git a/contexts/GameStateContext.tsx b/contexts/GameStateContext.tsx
@@ -21,7 +21,7 @@ export const GameStateContextProvider: React.FC<{ children: React.ReactNode }> =
 
   return <GameStateContext.Provider value={contextValue}>{children}</GameStateContext.Provider>;
 }
-// export const useGameStateContext = () => useContext(GameStateContext);
+export const useGameStateContext = () => useContext(GameStateContext);
 
 // export interface IGameStateContext {
 //   finishGameCheckResult: null | { winner: boolean; isDraw: boolean; cheatWin: boolean };

diff --git a/pages/_app.tsx b/pages/_app.tsx
@@ -14,7 +14,7 @@ import XmtpProvider from '../contexts/XmtpProvider';
 // TODO: don't forget to bring back alchemy instead of publicProvider. @habdevs #190
 // import {alchemyProvider} from 'wagmi/providers/alchemy';
 import {GameStateContextProvider} from 'contexts/GameStateContext';
-import { publicProvider } from 'wagmi/providers/public';
+import {publicProvider} from 'wagmi/providers/public';
 
 const {chains, provider, webSocketProvider} = configureChains(
   [polygon],
@@ -47,11 +47,11 @@ function MyApp({Component, pageProps}: AppProps) {
   return (
     <WagmiConfig client={wagmiClient}>
       <ApolloProvider client={client}>
-        <GameStateContextProvider>
-          <WalletContextProvider>
-            <XmtpContextProvider>
-              <RainbowKitProvider chains={chains}>
-                <XmtpProvider>
+        <WalletContextProvider>
+          <XmtpContextProvider>
+            <RainbowKitProvider chains={chains}>
+              <XmtpProvider>
+                <GameStateContextProvider>
                   <Layout version={version}>
                     <Head>
                       <meta
@@ -61,11 +61,11 @@ function MyApp({Component, pageProps}: AppProps) {
                     </Head>
                     <Component {...props} />
                   </Layout>
-                </XmtpProvider>
-              </RainbowKitProvider>
-            </XmtpContextProvider>
-          </WalletContextProvider>
-        </GameStateContextProvider>
+                </GameStateContextProvider>
+              </XmtpProvider>
+            </RainbowKitProvider>
+          </XmtpContextProvider>
+        </WalletContextProvider>
       </ApolloProvider>
     </WagmiConfig>
   );