From 8a49633bfb20107a9add7175d7dc8fc4872c3661 Mon Sep 17 00:00:00 2001
From: Andrew Rosiclair <arosiclair@expensify.com>
Date: Fri, 29 Jul 2022 15:19:42 -0400
Subject: [PATCH 1/2] added header with dismiss buttons

---
 .../BlockingViews/FullPageNotFoundView.js     | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/components/BlockingViews/FullPageNotFoundView.js b/src/components/BlockingViews/FullPageNotFoundView.js
index 9b9afdcd8b83..afc684b80656 100644
--- a/src/components/BlockingViews/FullPageNotFoundView.js
+++ b/src/components/BlockingViews/FullPageNotFoundView.js
@@ -1,9 +1,13 @@
 
 import React from 'react';
 import PropTypes from 'prop-types';
+import {View} from 'react-native';
 import BlockingView from './BlockingView';
 import * as Expensicons from '../Icon/Expensicons';
 import withLocalize, {withLocalizePropTypes} from '../withLocalize';
+import HeaderWithCloseButton from '../HeaderWithCloseButton';
+import Navigation from '../../libs/Navigation/Navigation';
+import styles from '../../styles/styles';
 
 const propTypes = {
     /** Props to fetch translation features */
@@ -24,11 +28,21 @@ const defaultProps = {
 const FullPageNotFoundView = (props) => {
     if (props.shouldShow) {
         return (
-            <BlockingView
-                icon={Expensicons.QuestionMark}
-                title={props.translate('notFound.notHere')}
-                subtitle={props.translate('notFound.pageNotFound')}
-            />
+            <View style={[styles.flex1, styles.dFlex, styles.flexColumn]}>
+                <HeaderWithCloseButton
+                    shouldShowBackButton
+                    onBackButtonPress={() => Navigation.dismissModal()}
+                    onCloseButtonPress={() => Navigation.dismissModal()}
+                />
+                <View style={styles.flex1}>
+                    <BlockingView
+                        icon={Expensicons.QuestionMark}
+                        title={props.translate('notFound.notHere')}
+                        subtitle={props.translate('notFound.pageNotFound')}
+                    />
+                </View>
+            </View>
+
         );
     }
 

From 04dd52c5a9de347a80792c29ea6dba2c302975c8 Mon Sep 17 00:00:00 2001
From: Andrew Rosiclair <arosiclair@expensify.com>
Date: Mon, 1 Aug 2022 13:17:33 -0400
Subject: [PATCH 2/2] use simpler fragment for layout

---
 src/components/BlockingViews/FullPageNotFoundView.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/BlockingViews/FullPageNotFoundView.js b/src/components/BlockingViews/FullPageNotFoundView.js
index afc684b80656..8a4447bb0cdc 100644
--- a/src/components/BlockingViews/FullPageNotFoundView.js
+++ b/src/components/BlockingViews/FullPageNotFoundView.js
@@ -28,7 +28,7 @@ const defaultProps = {
 const FullPageNotFoundView = (props) => {
     if (props.shouldShow) {
         return (
-            <View style={[styles.flex1, styles.dFlex, styles.flexColumn]}>
+            <>
                 <HeaderWithCloseButton
                     shouldShowBackButton
                     onBackButtonPress={() => Navigation.dismissModal()}
@@ -41,7 +41,7 @@ const FullPageNotFoundView = (props) => {
                         subtitle={props.translate('notFound.pageNotFound')}
                     />
                 </View>
-            </View>
+            </>
 
         );
     }