From 8cd1587a0af39a6953cc54f43a22949cb46df9c3 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 17 Apr 2026 12:49:48 +0000
Subject: [PATCH] fix: disable claim button while loading claim data after
 network switch

Agent-Logs-Url: https://github.com/GoodDollar/GoodProtocolUI/sessions/0ec70188-627a-4758-a3f2-8bf06af11a14

Co-authored-by: L03TJ3 <6606028+L03TJ3@users.noreply.github.com>
---
 src/pages/gd/Claim/OldClaim.tsx | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/pages/gd/Claim/OldClaim.tsx b/src/pages/gd/Claim/OldClaim.tsx
index 2c3ee2948..2a52f005d 100644
--- a/src/pages/gd/Claim/OldClaim.tsx
+++ b/src/pages/gd/Claim/OldClaim.tsx
@@ -11,7 +11,7 @@ import {
     useScreenSize,
     ClaimSuccessModal,
 } from '@gooddollar/good-design'
-import { Box, Center, Text, useBreakpointValue } from 'native-base'
+import { Box, Center, Spinner, Text, useBreakpointValue } from 'native-base'
 import { useConnectionInfo } from 'hooks/useConnectionInfo'
 import {
     useClaim,
@@ -52,6 +52,7 @@ const OldClaim = memo(() => {
     })
 
     const [claimed, setClaimed] = useState<boolean | undefined>(undefined)
+    const [isClaimLoading, setIsClaimLoading] = useState(true)
     const { address, chainId } = useConnectionInfo()
     const { open } = useAppKit()
     const network = SupportedV2Networks[chainId]
@@ -103,15 +104,18 @@ const OldClaim = memo(() => {
 
             if (claimAmount?.isZero()) {
                 setClaimed(true)
+                setIsClaimLoading(false)
                 setRefreshRate(12)
                 resetState()
                 return
             } else if (state.status === 'Success') {
                 setClaimed(true)
+                setIsClaimLoading(false)
                 return
             }
 
             setClaimed(false)
+            setIsClaimLoading(false)
             setRefreshRate('everyBlock')
         }
         if (claimAmount) hasClaimed().catch(noop)
@@ -121,6 +125,7 @@ const OldClaim = memo(() => {
     // upon switching chain we want temporarily to poll everyBlock up untill we have the latest data
     useEffect(() => {
         setClaimed(undefined)
+        setIsClaimLoading(true)
         setRefreshRate('everyBlock')
     }, [/* used */ chainId])
 
@@ -407,16 +412,22 @@ const OldClaim = memo(() => {
                                         </>
                                     )}
 
-                                    <ClaimButton
-                                        firstName="Test"
-                                        method="redirect"
-                                        claim={handleClaim}
-                                        claimed={claimed}
-                                        claiming={state}
-                                        handleConnect={handleConnect}
-                                        chainId={+(chainId ?? 42220)}
-                                        onEvent={handleEvents}
-                                    />
+                                    {isClaimLoading ? (
+                                        <Center pt="8" pb="8">
+                                            <Spinner size="lg" color="gdPrimary" />
+                                        </Center>
+                                    ) : (
+                                        <ClaimButton
+                                            firstName="Test"
+                                            method="redirect"
+                                            claim={handleClaim}
+                                            claimed={claimed}
+                                            claiming={state}
+                                            handleConnect={handleConnect}
+                                            chainId={+(chainId ?? 42220)}
+                                            onEvent={handleEvents}
+                                        />
+                                    )}
                                     {isHoliday ? (
                                         <Center maxW="390" width="100%" mb={8}>
                                             <Image