Merge pull request Expensify#47622 from dominictb/fix/46388-modal-close

fix: only dismiss the report attachment modal once

src/pages/home/report/ReportAttachments.tsx

@@ -1,5 +1,5 @@
 import type {StackScreenProps} from '@react-navigation/stack';
-import React, {useCallback} from 'react';
+import React, {useCallback, useEffect, useRef} from 'react';
 import {useOnyx} from 'react-native-onyx';
 import AttachmentModal from '@components/AttachmentModal';
 import type {Attachment} from '@components/Attachments/types';
@@ -18,6 +18,14 @@ function ReportAttachments({route}: ReportAttachmentsProps) {
     const accountID = route.params.accountID;
     const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID || -1}`);
     const [isLoadingApp] = useOnyx(ONYXKEYS.IS_LOADING_APP);
+    const hasDismissedModalRef = useRef(false);
+
+    useEffect(
+        () => () => {
+            hasDismissedModalRef.current = false;
+        },
+        [],
+    );
 
     // In native the imported images sources are of type number. Ref: https://reactnative.dev/docs/image#imagesource
     const source = Number(route.params.source) || route.params.source;
@@ -39,7 +47,10 @@ function ReportAttachments({route}: ReportAttachmentsProps) {
             report={report}
             source={source}
             onModalClose={() => {
-                Navigation.dismissModal();
+                if (!hasDismissedModalRef.current) {
+                    Navigation.dismissModal();
+                    hasDismissedModalRef.current = true;
+                }
                 // This enables Composer refocus when the attachments modal is closed by the browser navigation
                 ComposerFocusManager.setReadyToFocus();
             }}