Merge pull request #1496 from AmbireTech/fix/modal-close-claimable-modal

Fix / Close Rewards And Unbound Modals On Claim
AmbireTech · Dec 14, 2023 · d53b73a · d53b73a
2 parents 0bda566 + 52d4846
commit d53b73a
Showing 1 changed file with 19 additions and 3 deletions.
diff --git 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,7 +40,21 @@ 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 claimWithVesting = () => {
+    claimVesting()
+    hideModal()
+  }
 
   const eligibilityLeft = MIN_ELIGIBLE_USD - rewards.balance.balanceInUSD
   const isEligible = eligibilityLeft <= 0
@@ -188,7 +204,7 @@ const WalletTokenModal = ({ accountId, claimableWalletToken, rewards, network })
             <Button
               className={styles.fullWidthButton}
               variant="terniaryGradient"
-              onClick={claimEarlyRewards}
+              onClick={claimEarly}
               disabled={!!(claimDisabledReason || disabledReason)}
             >
               CLAIM IN xWALLET
@@ -237,7 +253,7 @@ const WalletTokenModal = ({ accountId, claimableWalletToken, rewards, network })
               <Button
                 variant="primaryGradient"
                 className={styles.fullWidthButton}
-                onClick={claimVesting}
+                onClick={claimWithVesting}
                 disabled={!!disabledReason}
               >
                 Claim