Merge pull request #25164 from GItGudRatio/fix/24391-full-page-not-found

fix: always show go back to home screen link on FullPageNotFoundView
Expensify · Aug 18, 2023 · 68ac7c9 · 68ac7c9
2 parents 4de6fd7 + 87ea677
commit 68ac7c9
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 8 deletions.
diff --git a/src/components/BlockingViews/BlockingView.js b/src/components/BlockingViews/BlockingView.js
@@ -42,7 +42,7 @@ const propTypes = {
 const defaultProps = {
     iconColor: themeColors.offline,
     subtitle: '',
-    shouldShowLink: false,
+    shouldShowLink: true,
     link: 'notFound.goBackHome',
     iconWidth: variables.iconSizeSuperLarge,
     iconHeight: variables.iconSizeSuperLarge,

diff --git a/src/components/BlockingViews/FullPageNotFoundView.js b/src/components/BlockingViews/FullPageNotFoundView.js
@@ -48,7 +48,7 @@ const defaultProps = {
     subtitleKey: 'notFound.pageNotFound',
     linkKey: 'notFound.goBackHome',
     onBackButtonPress: Navigation.goBack,
-    shouldShowLink: false,
+    shouldShowLink: true,
     shouldShowBackButton: true,
     onLinkPress: () => Navigation.dismissModal(),
 };

diff --git a/src/pages/ErrorPage/NotFoundPage.js b/src/pages/ErrorPage/NotFoundPage.js
@@ -6,10 +6,7 @@ import FullPageNotFoundView from '../../components/BlockingViews/FullPageNotFoun
 function NotFoundPage() {
     return (
         <ScreenWrapper>
-            <FullPageNotFoundView
-                shouldShow
-                shouldShowLink
-            />
+            <FullPageNotFoundView shouldShow />
         </ScreenWrapper>
     );
 }

diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
@@ -344,7 +344,6 @@ class ReimbursementAccountPage extends React.Component {
                         shouldShow
                         onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WORKSPACES)}
                         subtitleKey={_.isEmpty(this.props.policy) ? undefined : 'workspace.common.notAuthorized'}
-                        shouldShowLink
                     />
                 </ScreenWrapper>
             );

diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js
@@ -297,6 +297,7 @@ class ReportScreen extends React.Component {
                         shouldShowCloseButton={false}
                         shouldShowBackButton={this.props.isSmallScreenWidth}
                         onBackButtonPress={Navigation.goBack}
+                        shouldShowLink={false}
                     >
                         <OfflineWithFeedback
                             pendingAction={addWorkspaceRoomOrChatPendingAction}

diff --git a/src/pages/settings/Wallet/TransferBalancePage.js b/src/pages/settings/Wallet/TransferBalancePage.js
@@ -175,7 +175,6 @@ function TransferBalancePage(props) {
                 shouldShow={!shouldShowTransferView}
                 titleKey="notFound.pageNotFound"
                 subtitleKey="transferAmountPage.notHereSubTitle"
-                shouldShowLink
                 linkKey="transferAmountPage.goToWallet"
                 onLinkPress={() => Navigation.goBack(ROUTES.SETTINGS_WALLET)}
             >

diff --git a/src/pages/tasks/NewTaskPage.js b/src/pages/tasks/NewTaskPage.js
@@ -139,6 +139,7 @@ function NewTaskPage(props) {
             <FullPageNotFoundView
                 shouldShow={!isAllowedToCreateTask}
                 onBackButtonPress={() => Task.dismissModalAndClearOutTaskInfo()}
+                shouldShowLink={false}
             >
                 <HeaderWithBackButton
                     title={props.translate('newTaskPage.confirmTask')}