From 66981fe023d4bc3cd6cdecb935baec67e7c5d978 Mon Sep 17 00:00:00 2001
From: CleanBread <gleb4ist@gmail.com>
Date: Wed, 8 Jan 2025 11:36:25 +0100
Subject: [PATCH] improve statistic condition

---
 src/compositions/LiveStatistics/LiveStatistics.tsx | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/compositions/LiveStatistics/LiveStatistics.tsx b/src/compositions/LiveStatistics/LiveStatistics.tsx
index 0bcfe24..8ae8de0 100644
--- a/src/compositions/LiveStatistics/LiveStatistics.tsx
+++ b/src/compositions/LiveStatistics/LiveStatistics.tsx
@@ -30,12 +30,18 @@ const LiveStatistics: React.FC<LiveStatisticsProps> = ({ withCollapse = true, wi
   const [ isVisible, setVisible ] = useState(true)
   const [ isWarningVisible, setWarningVisible ] = useState(false)
   const { liveClient } = useApolloClients()
-  const gameId = useSyncExternalStore(
+  const storeGameId = useSyncExternalStore(
     liveStatisticsGameIdStore.subscribe,
     liveStatisticsGameIdStore.getSnapshot,
     () => ''
   )
 
+  let gameId = storeGameId
+
+  if (params.gameId) {
+    gameId = params.gameId as string
+  }
+
   const game = useMemo(() => {
     return liveClient!.cache.readFragment<MainGameInfoFragment>({
       id: liveClient!.cache.identify({ __typename: 'Game', id: gameId }),
@@ -58,7 +64,7 @@ const LiveStatistics: React.FC<LiveStatisticsProps> = ({ withCollapse = true, wi
       return
     }
 
-    if (gameId && gameId !== params.gameId) {
+    if (gameId && storeGameId !== gameId) {
       setWarningVisible(true)
 
       setTimeout(() => {
@@ -67,7 +73,7 @@ const LiveStatistics: React.FC<LiveStatisticsProps> = ({ withCollapse = true, wi
         }
       }, 5000)
     }
-  }, [ gameId, params.gameId ])
+  }, [ storeGameId, params.gameId ])
 
   if (!isAvailable || !gameId || !LIVE_STATISTICS_SUPPORTED_SPORTS.includes(+game?.sport?.sportId!)) {
     return null