From 95a413d9960d9d503f9ec9ef9f7e949c3f388e60 Mon Sep 17 00:00:00 2001
From: "Galio (Demaciains)" <galio.demaciains@proton.me>
Date: Wed, 25 Mar 2026 22:28:56 +0000
Subject: [PATCH] fix: disable claim button while loading claim data after
 network switch

When switching networks, the claim data (claimAmount, isWhitelisted) takes
time to load from the blockchain. During this window,  is set to
, causing ClaimButton's internal  to evaluate
to  (falsy), making the button appear clickable.

This fix shows a loading spinner while , preventing
users from clicking a non-functional button. The ClaimButton reappears
once claim data is loaded.

Fixes #614
---
 src/pages/gd/Claim/OldClaim.tsx | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/pages/gd/Claim/OldClaim.tsx b/src/pages/gd/Claim/OldClaim.tsx
index 2c3ee2948..ad7451785 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,
@@ -407,16 +407,22 @@ const OldClaim = memo(() => {
                                         </>
                                     )}
 
-                                    <ClaimButton
-                                        firstName="Test"
-                                        method="redirect"
-                                        claim={handleClaim}
-                                        claimed={claimed}
-                                        claiming={state}
-                                        handleConnect={handleConnect}
-                                        chainId={+(chainId ?? 42220)}
-                                        onEvent={handleEvents}
-                                    />
+                                    {claimed === undefined ? (
+                                        <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