Merge pull request Expensify#89150 from callstack-internal/bugfix/money-request-report-navigation-dismiss

Fix modal dismiss on report route change in SearchMoneyRequestReportPage

Author: mountiny

src/pages/Search/SearchMoneyRequestReportPage.tsx

@@ -87,6 +87,7 @@ function SearchMoneyRequestReportPage({route}: SearchMoneyRequestPageProps) {
 
     const [parentReportLoadingState] = useOnyx(`${ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE}${report?.parentReportID}`);
     const prevReport = usePrevious(report);
+    const prevReportIDFromRoute = usePrevious(reportIDFromRoute);
     const {email: currentUserEmail, accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
     const isFocused = useIsFocused();
 
@@ -98,6 +99,11 @@ function SearchMoneyRequestReportPage({route}: SearchMoneyRequestPageProps) {
             return;
         }
 
+        // Route just changed — new report data may not be loaded yet, so don't treat as removal.
+        if (prevReportIDFromRoute !== reportIDFromRoute) {
+            return;
+        }
+
         // Report is gone now but we had a money request report before → it was removed.
         const isRemovalExpectedForReportType = !report && isMoneyRequestReport(prevReport);
 
@@ -107,7 +113,7 @@ function SearchMoneyRequestReportPage({route}: SearchMoneyRequestPageProps) {
             }
             Navigation.dismissModal();
         }
-    }, [report, isFocused, prevReport]);
+    }, [report, isFocused, prevReport, prevReportIDFromRoute, reportIDFromRoute]);
 
     useEffect(() => {
         // Update last visit time when the expense super wide RHP report is focused
@@ -204,7 +210,6 @@ function SearchMoneyRequestReportPage({route}: SearchMoneyRequestPageProps) {
 
     // Tracks initial mount to ensure openReport is called once for multi-transaction reports
     const isInitialMountRef = useRef(true);
-    const prevReportIDFromRoute = usePrevious(reportIDFromRoute);
 
     useEffect(() => {
         // Reset flag when reportID changes (screen stays mounted but navigates to different report)