From 15909890b510feecbf248cf8cf20217e928c188a Mon Sep 17 00:00:00 2001
From: Gergana Mihaylova <gergana@devlabs.bg>
Date: Wed, 13 Dec 2023 12:09:24 +0200
Subject: [PATCH 1/2] Fix: Close Rewards And Unbound Modals On Claim

---
 .../Modals/WalletTokenModal/WalletTokenModal.js    | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/components/Modals/WalletTokenModal/WalletTokenModal.js b/src/components/Modals/WalletTokenModal/WalletTokenModal.js
index bb092c9237..1902d2d0a6 100644
--- a/src/components/Modals/WalletTokenModal/WalletTokenModal.js
+++ b/src/components/Modals/WalletTokenModal/WalletTokenModal.js
@@ -6,6 +6,7 @@ import { rpcProviders } from 'config/providers'
 import { formatFloatTokenAmount } from 'lib/formatters'
 
 import { Button, Modal, ToolTip, RemoteLottie, Loading } from 'components/common'
+import { useModals } from 'hooks'
 import MultiplierBadges from './MultiplierBadges/MultiplierBadges'
 import UnbondModal from './UnbondModal/UnbondModal'
 
@@ -18,6 +19,7 @@ const WalletTokenModal = ({ accountId, claimableWalletToken, rewards, network })
   const [isUnbondModalVisible, setIsUnbondModalVisible] = useState(false)
   const provider = rpcProviders['ethereum-ambire-earn']
   const { stakedAmount, isLoading } = useStakedWalletToken({ accountId, provider })
+  const { hideModal } = useModals()
 
   const hideUnbondModal = () => setIsUnbondModalVisible(false)
 
@@ -38,8 +40,16 @@ const WalletTokenModal = ({ accountId, claimableWalletToken, rewards, network })
 
   const { walletTokenAPYPercentage, adxTokenAPYPercentage, xWALLETAPYPercentage } = rewards
 
-  const claimWithBurn = () => claimEarlyRewards(false)
+  const claimWithBurn = () => {
+    claimEarlyRewards(false)
+    hideUnbondModal()
+    hideModal()
+  }
 
+  const claimEarly = () => {
+    claimEarlyRewards(true)
+    hideModal()
+  }
   const eligibilityLeft = MIN_ELIGIBLE_USD - rewards.balance.balanceInUSD
   const isEligible = eligibilityLeft <= 0
   const accumulatedWallets = rewards['balance-rewards'] + rewards['adx-rewards']
@@ -188,7 +198,7 @@ const WalletTokenModal = ({ accountId, claimableWalletToken, rewards, network })
             <Button
               className={styles.fullWidthButton}
               variant="terniaryGradient"
-              onClick={claimEarlyRewards}
+              onClick={claimEarly}
               disabled={!!(claimDisabledReason || disabledReason)}
             >
               CLAIM IN xWALLET

From 52d48469d7944cde6e842e37c61c4cfd1610a5bc Mon Sep 17 00:00:00 2001
From: Gergana Mihaylova <gergana@devlabs.bg>
Date: Wed, 13 Dec 2023 14:13:33 +0200
Subject: [PATCH 2/2] Add: close modal on claim with vesting

---
 .../Modals/WalletTokenModal/WalletTokenModal.js           | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/Modals/WalletTokenModal/WalletTokenModal.js b/src/components/Modals/WalletTokenModal/WalletTokenModal.js
index 1902d2d0a6..baa0d8a1e7 100644
--- a/src/components/Modals/WalletTokenModal/WalletTokenModal.js
+++ b/src/components/Modals/WalletTokenModal/WalletTokenModal.js
@@ -50,6 +50,12 @@ const WalletTokenModal = ({ accountId, claimableWalletToken, rewards, network })
     claimEarlyRewards(true)
     hideModal()
   }
+
+  const claimWithVesting = () => {
+    claimVesting()
+    hideModal()
+  }
+
   const eligibilityLeft = MIN_ELIGIBLE_USD - rewards.balance.balanceInUSD
   const isEligible = eligibilityLeft <= 0
   const accumulatedWallets = rewards['balance-rewards'] + rewards['adx-rewards']
@@ -247,7 +253,7 @@ const WalletTokenModal = ({ accountId, claimableWalletToken, rewards, network })
               <Button
                 variant="primaryGradient"
                 className={styles.fullWidthButton}
-                onClick={claimVesting}
+                onClick={claimWithVesting}
                 disabled={!!disabledReason}
               >
                 Claim