fix: check suggested slippage before applying (#2872)

* fix: check suggested slippage before applying

* fix: close claim modal if change account

Author: tienkane

apps/kyberswap-interface/src/components/SwapForm/SwapModal/ConfirmSwapModalContent.tsx

@@ -385,7 +385,7 @@ export default function ConfirmSwapModalContent({
       <TransactionErrorContent
         onDismiss={onDismiss}
         confirmAction={() => {
-          if (retry < 1) {
+          if (retry < 1 && slippage !== dynamicSuggestedSlippage) {
             setRetry(prev => prev + 1)
             setRawSlippage(dynamicSuggestedSlippage)
           } else {
@@ -394,16 +394,19 @@ export default function ConfirmSwapModalContent({
             onDismiss()
           }
         }}
-        confirmText={retry < 1 ? t`Use Suggested Slippage` : t`Set Custom Slippage`}
+        confirmText={
+          retry < 1 && slippage !== dynamicSuggestedSlippage ? t`Use Suggested Slippage` : t`Set Custom Slippage`
+        }
         message={
-          retry < 1
+          retry < 1 && slippage !== dynamicSuggestedSlippage
             ? errorWhileBuildRoute
             : t`This route may currently be too volatile to execute. Try to custom your own slippage to continue.`
         }
         confirmBtnStyle={{ flex: 2 }}
         dismissBtnStyle={{ flex: 1 }}
         suggestionMessage={
-          retry < 1 && (
+          retry < 1 &&
+          slippage !== dynamicSuggestedSlippage && (
             <Text marginTop="8px" fontSize={16} color={theme.text}>
               <Trans>New Suggested Slippage:</Trans> {(dynamicSuggestedSlippage * 100) / 10_000}%{' '}
               <InfoHelper

apps/kyberswap-interface/src/pages/Earns/hooks/useCollectFees.tsx

@@ -6,6 +6,7 @@ import { useActiveWeb3React, useWeb3React } from 'hooks'
 import ClaimModal, { ClaimInfo, ClaimType } from 'pages/Earns/components/ClaimModal'
 import { EARN_DEXES, Exchange } from 'pages/Earns/constants'
 import { CoreProtocol } from 'pages/Earns/constants/coreProtocol'
+import useAccountChanged from 'pages/Earns/hooks/useAccountChanged'
 import useCompounding from 'pages/Earns/hooks/useCompounding'
 import { ParsedPosition } from 'pages/Earns/types'
 import { getNftManagerContract, submitTransaction } from 'pages/Earns/utils'
@@ -179,6 +180,8 @@ const useCollectFees = ({ refetchAfterCollect }: { refetchAfterCollect: () => vo
     }
   }, [allTransactions, refetchAfterCollect, txHash])
 
+  useAccountChanged(onCloseClaim)
+
   const claimModal =
     openClaimModal && claimInfo ? (
       <>

apps/kyberswap-interface/src/pages/Earns/hooks/useKemRewards.tsx

@@ -11,6 +11,7 @@ import useFilter from 'pages/Earns/UserPositions/useFilter'
 import ClaimAllModal from 'pages/Earns/components/ClaimAllModal'
 import ClaimModal, { ClaimInfo, ClaimType } from 'pages/Earns/components/ClaimModal'
 import { EARN_CHAINS, EarnChain } from 'pages/Earns/constants'
+import useAccountChanged from 'pages/Earns/hooks/useAccountChanged'
 import useCompounding from 'pages/Earns/hooks/useCompounding'
 import { ParsedPosition, RewardInfo, TokenInfo } from 'pages/Earns/types'
 import { getNftManagerContractAddress, submitTransaction } from 'pages/Earns/utils'
@@ -334,6 +335,11 @@ const useKemRewards = (refetchAfterCollect?: () => void) => {
     if (!rewardInfo?.chains.length) setOpenClaimAllModal(false)
   }, [rewardInfo?.chains.length])
 
+  useAccountChanged(() => {
+    onCloseClaim()
+    setOpenClaimAllModal(false)
+  })
+
   const claimModal =
     openClaimModal && claimInfo ? (
       <>