Merge pull request #5983 from EdgeApp/jon/fix/swap-kyc-modal-popup

Author: j0ntz

CHANGELOG.md

@@ -6,6 +6,7 @@
 
 - added: Include Zano sweep private key support for ZANO and tokens.
 - changed: Move `importKeyOptions` into `CreateWalletImportScene`
+- fixed: Swap KYC terms modal stacking on auto-refresh and accidental dismissal disabling providers
 - removed: Remove `CreateWalletImportOptionsScene`
 
 ## 4.46.0 (2026-03-20)

src/components/modals/SwapVerifyTermsModal.tsx

@@ -111,9 +111,6 @@ const SwapVerifyTermsModal: React.FC<Props> = props => {
           <ModalTitle>{displayName}</ModalTitle>
         </View>
       }
-      onCancel={() => {
-        bridge.resolve(false)
-      }}
     >
       <Paragraph>{lstrings.swap_terms_statement}</Paragraph>
       <ModalButtons

src/components/scenes/SwapConfirmationScene.tsx

@@ -98,6 +98,9 @@ export const SwapConfirmationScene: React.FC<Props> = (props: Props) => {
 
   const isFocused = useIsFocused()
 
+  const termsCheckPending = React.useRef(false)
+  const timerExpiredDuringTerms = React.useRef(false)
+
   const pickBestQuoteWithPreference = (
     allQuotes: EdgeSwapQuote[]
   ): EdgeSwapQuote => {
@@ -206,6 +209,10 @@ export const SwapConfirmationScene: React.FC<Props> = (props: Props) => {
 
   const handleExchangeTimerExpired = useHandler(() => {
     if (!isFocused) return
+    if (termsCheckPending.current) {
+      timerExpiredDuringTerms.current = true
+      return
+    }
 
     navigation.replace('swapProcessing', {
       swapRequest: selectedQuote.request,
@@ -227,12 +234,20 @@ export const SwapConfirmationScene: React.FC<Props> = (props: Props) => {
     const swapConfig = account.swapConfig[pluginId]
 
     dispatch(logEvent('Exchange_Shift_Quote'))
+    termsCheckPending.current = true
     swapVerifyTerms(swapConfig)
       .then(async result => {
-        if (!result) handleExchangeTimerExpired()
+        termsCheckPending.current = false
+        if (!result || timerExpiredDuringTerms.current) {
+          handleExchangeTimerExpired()
+        }
       })
       .catch((err: unknown) => {
+        termsCheckPending.current = false
         showError(err)
+        if (timerExpiredDuringTerms.current) {
+          handleExchangeTimerExpired()
+        }
       })
   })