fix: Add cancellable to winnings popup to abort call when rerender (p…

…ancakeswap#1182)
MeetNevermore · May 12, 2021 · b373a52 · b373a52
1 parent f9f1545
commit b373a52
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/views/Predictions/components/CollectWinningsPopup.tsx b/src/views/Predictions/components/CollectWinningsPopup.tsx
@@ -139,23 +139,27 @@ const CollectWinningsPopup = () => {
 
   // Check user's history for unclaimed winners
   useEffect(() => {
+    let isCancelled = false
     if (account) {
       timer.current = setInterval(async () => {
         const bets = await getBetHistory({ user: account.toLowerCase(), claimed: false })
 
-        // Filter out bets that were not winners
-        const winnerBets = bets.filter((bet) => {
-          return bet.position === bet.round.position
-        })
+        if (!isCancelled) {
+          // Filter out bets that were not winners
+          const winnerBets = bets.filter((bet) => {
+            return bet.position === bet.round.position
+          })
 
-        if (!isHistoryPaneOpen) {
-          setIsOpen(winnerBets.length > 0)
+          if (!isHistoryPaneOpen) {
+            setIsOpen(winnerBets.length > 0)
+          }
         }
       }, 30000)
     }
 
     return () => {
       clearInterval(timer.current)
+      isCancelled = true
     }
   }, [account, timer, predictionStatus, setIsOpen, isHistoryPaneOpen])