Merge pull request #48332 from allgandalf/issue48298

fix app freeze (cherry picked from commit 9155617) (CP triggered by puneetlath)
Expensify · Aug 30, 2024 · 22e0328 · 22e0328
1 parent 9ccda92
commit 22e0328
Showing 1 changed file with 17 additions and 16 deletions.
diff --git a/src/pages/settings/Wallet/WalletPage/WalletPage.tsx b/src/pages/settings/Wallet/WalletPage/WalletPage.tsx
@@ -34,6 +34,7 @@ import PaymentMethodList from '@pages/settings/Wallet/PaymentMethodList';
 import WalletEmptyState from '@pages/settings/Wallet/WalletEmptyState';
 import variables from '@styles/variables';
 import * as BankAccounts from '@userActions/BankAccounts';
+import * as Modal from '@userActions/Modal';
 import * as PaymentMethods from '@userActions/PaymentMethods';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -576,27 +577,27 @@ function WalletPage({bankAccountList = {}, cardList = {}, fundList = {}, isLoadi
                                 <MenuItem
                                     title={translate('common.delete')}
                                     icon={Expensicons.Trashcan}
-                                    onPress={() => setShowConfirmDeleteModal(true)}
+                                    onPress={() => Modal.close(() => setShowConfirmDeleteModal(true))}
                                     wrapperStyle={[styles.pv3, styles.ph5, !shouldUseNarrowLayout ? styles.sidebarPopover : {}]}
                                 />
                             </View>
                         )}
-                        <ConfirmModal
-                            isVisible={showConfirmDeleteModal}
-                            onConfirm={() => {
-                                deletePaymentMethod();
-                                hideDefaultDeleteMenu();
-                            }}
-                            onCancel={hideDefaultDeleteMenu}
-                            title={translate('walletPage.deleteAccount')}
-                            prompt={translate('walletPage.deleteConfirmation')}
-                            confirmText={translate('common.delete')}
-                            cancelText={translate('common.cancel')}
-                            shouldShowCancelButton
-                            danger
-                            onModalHide={resetSelectedPaymentMethodData}
-                        />
                     </Popover>
+                    <ConfirmModal
+                        isVisible={showConfirmDeleteModal}
+                        onConfirm={() => {
+                            deletePaymentMethod();
+                            hideDefaultDeleteMenu();
+                        }}
+                        onCancel={hideDefaultDeleteMenu}
+                        title={translate('walletPage.deleteAccount')}
+                        prompt={translate('walletPage.deleteConfirmation')}
+                        confirmText={translate('common.delete')}
+                        cancelText={translate('common.cancel')}
+                        shouldShowCancelButton
+                        danger
+                        onModalHide={resetSelectedPaymentMethodData}
+                    />
                 </ScreenWrapper>
             )}
             <AddPaymentMethodMenu