Merge pull request Expensify#41472 from bernhardoj/fix/40801-double-n…

…avigation-when-closing-attachment-modal Fix user is navigated to IOU report when dismissing receipt modal with ESC key
DylanDylann · May 10, 2024 · 390e2a8 · 390e2a8
2 parents 0940378 + c970341
commit 390e2a8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/src/components/Modal/BaseModal.tsx b/src/components/Modal/BaseModal.tsx
@@ -75,9 +75,11 @@ function BaseModal(
      */
     const hideModal = useCallback(
         (callHideCallback = true) => {
-            Modal.willAlertModalBecomeVisible(false);
-            if (shouldSetModalVisibility) {
-                Modal.setModalVisibility(false);
+            if (Modal.areAllModalsHidden()) {
+                Modal.willAlertModalBecomeVisible(false);
+                if (shouldSetModalVisibility) {
+                    Modal.setModalVisibility(false);
+                }
             }
             if (callHideCallback) {
                 onModalHide();

diff --git a/src/libs/actions/Modal.ts b/src/libs/actions/Modal.ts
@@ -85,4 +85,8 @@ function willAlertModalBecomeVisible(isVisible: boolean, isPopover = false) {
     Onyx.merge(ONYXKEYS.MODAL, {willAlertModalBecomeVisible: isVisible, isPopover});
 }
 
-export {setCloseModal, close, onModalDidClose, setModalVisibility, willAlertModalBecomeVisible, setDisableDismissOnEscape, closeTop};
+function areAllModalsHidden() {
+    return closeModals.length === 0;
+}
+
+export {setCloseModal, close, onModalDidClose, setModalVisibility, willAlertModalBecomeVisible, setDisableDismissOnEscape, closeTop, areAllModalsHidden};
diff --git a/src/pages/TransactionReceiptPage.tsx b/src/pages/TransactionReceiptPage.tsx
@@ -64,7 +64,7 @@ function TransactionReceipt({transaction, report, reportMetadata = {isLoadingIni
             originalFileName={receiptURIs?.filename}
             defaultOpen
             onModalClose={() => {
-                Navigation.goBack(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(report?.reportID ?? ''));
+                Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(report?.reportID ?? ''));
             }}
             isLoading={!transaction && reportMetadata?.isLoadingInitialReportActions}
             shouldShowNotFoundPage={shouldShowNotFoundPage}