From 98c56276e5d4d6ebed387312ccfa93c7c73aa6ac Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 31 Aug 2023 15:24:33 -0600
Subject: [PATCH 1/3] add onLinkPress to NotFoundPage

---
 src/pages/ErrorPage/NotFoundPage.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/pages/ErrorPage/NotFoundPage.js b/src/pages/ErrorPage/NotFoundPage.js
index f0121cd8f3ef..d9758ac26079 100644
--- a/src/pages/ErrorPage/NotFoundPage.js
+++ b/src/pages/ErrorPage/NotFoundPage.js
@@ -1,12 +1,16 @@
 import React from 'react';
 import ScreenWrapper from '../../components/ScreenWrapper';
 import FullPageNotFoundView from '../../components/BlockingViews/FullPageNotFoundView';
+import Navigation from '../../libs/Navigation/Navigation';
 
 // eslint-disable-next-line rulesdir/no-negated-variables
 function NotFoundPage() {
     return (
         <ScreenWrapper>
-            <FullPageNotFoundView shouldShow />
+            <FullPageNotFoundView
+                shouldShow 
+                onLinkPress={Navigation.navigate}
+            />
         </ScreenWrapper>
     );
 }

From c739a967b587e06d2265b220efe5ed3b17e8b8e7 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 31 Aug 2023 15:36:22 -0600
Subject: [PATCH 2/3] fix style

---
 src/pages/ErrorPage/NotFoundPage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/ErrorPage/NotFoundPage.js b/src/pages/ErrorPage/NotFoundPage.js
index d9758ac26079..cb6d03e0e4f0 100644
--- a/src/pages/ErrorPage/NotFoundPage.js
+++ b/src/pages/ErrorPage/NotFoundPage.js
@@ -8,7 +8,7 @@ function NotFoundPage() {
     return (
         <ScreenWrapper>
             <FullPageNotFoundView
-                shouldShow 
+                shouldShow
                 onLinkPress={Navigation.navigate}
             />
         </ScreenWrapper>

From 12c2ab24101a7b5aa48610b75577c6f52eafb73c Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 31 Aug 2023 15:42:41 -0600
Subject: [PATCH 3/3] use correct screen

---
 src/libs/Navigation/Navigation.js   | 2 +-
 src/pages/ErrorPage/NotFoundPage.js | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/libs/Navigation/Navigation.js b/src/libs/Navigation/Navigation.js
index 677981fcbeba..b574b4ffa205 100644
--- a/src/libs/Navigation/Navigation.js
+++ b/src/libs/Navigation/Navigation.js
@@ -161,7 +161,7 @@ function dismissModal(targetReportID) {
     const lastRoute = _.last(rootState.routes);
     switch (lastRoute.name) {
         case NAVIGATORS.RIGHT_MODAL_NAVIGATOR:
-        case NAVIGATORS.FULL_SCREEN_NAVIGATOR:
+        case SCREENS.NOT_FOUND:
         case SCREENS.REPORT_ATTACHMENTS:
             // if we are not in the target report, we need to navigate to it after dismissing the modal
             if (targetReportID && targetReportID !== getTopmostReportId(rootState)) {
diff --git a/src/pages/ErrorPage/NotFoundPage.js b/src/pages/ErrorPage/NotFoundPage.js
index cb6d03e0e4f0..f0121cd8f3ef 100644
--- a/src/pages/ErrorPage/NotFoundPage.js
+++ b/src/pages/ErrorPage/NotFoundPage.js
@@ -1,16 +1,12 @@
 import React from 'react';
 import ScreenWrapper from '../../components/ScreenWrapper';
 import FullPageNotFoundView from '../../components/BlockingViews/FullPageNotFoundView';
-import Navigation from '../../libs/Navigation/Navigation';
 
 // eslint-disable-next-line rulesdir/no-negated-variables
 function NotFoundPage() {
     return (
         <ScreenWrapper>
-            <FullPageNotFoundView
-                shouldShow
-                onLinkPress={Navigation.navigate}
-            />
+            <FullPageNotFoundView shouldShow />
         </ScreenWrapper>
     );
 }