Merge pull request #23988 from Expensify/beaman-returnWhenAttachmentGone

[CP Staging] Return early when dismissing modal so we don't call `onNavigate` with no attachments (cherry picked from commit 73e097c)
Expensify · Aug 1, 2023 · 759f7fa · 759f7fa
1 parent 0ae82a2
commit 759f7fa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/components/AttachmentCarousel/createInitialState.js b/src/components/AttachmentCarousel/createInitialState.js
@@ -52,6 +52,7 @@ function createInitialState(props) {
     const page = _.findIndex(attachments, (a) => a.source === props.source);
     if (page === -1) {
         Navigation.dismissModal();
+        return;
     }
 
     // Update the parent modal's state with the source and name from the mapped attachments

diff --git a/src/components/AttachmentCarousel/index.js b/src/components/AttachmentCarousel/index.js
@@ -50,8 +50,10 @@ function AttachmentCarousel(props) {
 
     useEffect(() => {
         const initialState = createInitialState(props);
-        setPage(initialState.page);
-        setAttachments(initialState.attachments);
+        if (initialState) {
+            setPage(initialState.page);
+            setAttachments(initialState.attachments);
+        }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [props.reportActions]);