Merge pull request #48148 from daledah/fix/47331

fix: prevent not here page open twice

src/pages/ErrorPage/NotFoundPage.tsx

@@ -2,18 +2,37 @@ import React from 'react';
 import type {FullPageNotFoundViewProps} from '@components/BlockingViews/FullPageNotFoundView';
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import ScreenWrapper from '@components/ScreenWrapper';
+import useWindowDimensions from '@hooks/useWindowDimensions';
+import Navigation from '@libs/Navigation/Navigation';
+import * as ReportUtils from '@libs/ReportUtils';
 
 type NotFoundPageProps = {
     onBackButtonPress?: () => void;
+    isReportRelatedPage?: boolean;
 } & FullPageNotFoundViewProps;
 
 // eslint-disable-next-line rulesdir/no-negated-variables
-function NotFoundPage({onBackButtonPress, ...fullPageNotFoundViewProps}: NotFoundPageProps) {
+function NotFoundPage({onBackButtonPress = () => Navigation.goBack(), isReportRelatedPage, ...fullPageNotFoundViewProps}: NotFoundPageProps) {
+    const {isSmallScreen} = useWindowDimensions();
+
     return (
         <ScreenWrapper testID={NotFoundPage.displayName}>
             <FullPageNotFoundView
                 shouldShow
-                onBackButtonPress={onBackButtonPress}
+                onBackButtonPress={() => {
+                    if (!isReportRelatedPage || !isSmallScreen) {
+                        onBackButtonPress();
+                        return;
+                    }
+                    const topmostReportId = Navigation.getTopmostReportId();
+                    const report = ReportUtils.getReport(topmostReportId ?? '');
+                    // detect the report is invalid
+                    if (topmostReportId && (!report || report.errorFields?.notFound)) {
+                        Navigation.dismissModal();
+                        return;
+                    }
+                    onBackButtonPress();
+                }}
                 // eslint-disable-next-line react/jsx-props-no-spreading
                 {...fullPageNotFoundViewProps}
             />

src/pages/home/report/withReportOrNotFound.tsx

@@ -85,7 +85,7 @@ export default function (
                 }
 
                 if (shouldShowNotFoundPage) {
-                    return <NotFoundPage />;
+                    return <NotFoundPage isReportRelatedPage />;
                 }
             }