From 5b2fc823f082741701966b6ead742e5c59581f83 Mon Sep 17 00:00:00 2001
From: Yauheni Horbach <HorbachZhenja@yandex.by>
Date: Thu, 9 Apr 2026 00:12:42 +0200
Subject: [PATCH 1/2] Fix lint issue

---
 src/pages/settings/Wallet/PersonalCards/AddNewCardPage.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/pages/settings/Wallet/PersonalCards/AddNewCardPage.tsx b/src/pages/settings/Wallet/PersonalCards/AddNewCardPage.tsx
index 835b9f4e92825..6c4bfd071fb15 100644
--- a/src/pages/settings/Wallet/PersonalCards/AddNewCardPage.tsx
+++ b/src/pages/settings/Wallet/PersonalCards/AddNewCardPage.tsx
@@ -1,4 +1,4 @@
-import React, {useEffect} from 'react';
+import React, {useEffect, useState} from 'react';
 import {View} from 'react-native';
 import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 import {ModalActions} from '@components/Modal/Global/ModalContext';
@@ -26,6 +26,7 @@ function AddPersonalNewCardPage() {
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
     const [betas] = useOnyx(ONYXKEYS.BETAS);
     const {currentStep} = addNewPersonalCardFeed ?? {};
+    const [isModalVisible, setIsModalVisible] = useState(false);
     const {showConfirmModal} = useConfirmModal();
     const {translate} = useLocalize();
     const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
@@ -65,6 +66,7 @@ function AddPersonalNewCardPage() {
             CurrentStep = (
                 <PlaidConnectionStep
                     onExit={() => {
+                        setIsModalVisible(true);
                         showConfirmModal({
                             title: translate('workspace.companyCards.addNewCard.exitModal.title'),
                             success: true,
@@ -73,8 +75,10 @@ function AddPersonalNewCardPage() {
                             prompt: translate('workspace.companyCards.addNewCard.exitModal.prompt'),
                         }).then((result) => {
                             if (result.action !== ModalActions.CONFIRM) {
+                                setIsModalVisible(false);
                                 return;
                             }
+                            setIsModalVisible(false);
                             navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, false, betas);
                         });
                     }}

From 78f763762289ed0db638f7e7045d09f50c9a47eb Mon Sep 17 00:00:00 2001
From: Yauheni Horbach <HorbachZhenja@yandex.by>
Date: Thu, 9 Apr 2026 00:35:36 +0200
Subject: [PATCH 2/2] Add .finally for showConfirmModal

---
 .../Wallet/PersonalCards/AddNewCardPage.tsx      | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/pages/settings/Wallet/PersonalCards/AddNewCardPage.tsx b/src/pages/settings/Wallet/PersonalCards/AddNewCardPage.tsx
index 6c4bfd071fb15..77ff0a98d0a46 100644
--- a/src/pages/settings/Wallet/PersonalCards/AddNewCardPage.tsx
+++ b/src/pages/settings/Wallet/PersonalCards/AddNewCardPage.tsx
@@ -73,14 +73,16 @@ function AddPersonalNewCardPage() {
                             confirmText: translate('workspace.companyCards.addNewCard.exitModal.confirmText'),
                             cancelText: translate('workspace.companyCards.addNewCard.exitModal.cancelText'),
                             prompt: translate('workspace.companyCards.addNewCard.exitModal.prompt'),
-                        }).then((result) => {
-                            if (result.action !== ModalActions.CONFIRM) {
+                        })
+                            .then((result) => {
+                                if (result.action !== ModalActions.CONFIRM) {
+                                    return;
+                                }
+                                navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, false, betas);
+                            })
+                            .finally(() => {
                                 setIsModalVisible(false);
-                                return;
-                            }
-                            setIsModalVisible(false);
-                            navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, false, betas);
-                        });
+                            });
                     }}
                 />
             );