Merge pull request #32909 from Expensify/Julesssss-cherry-pick-stagin…

…g-32877-1

🍒 Cherry pick PR #32877 to staging 🍒

android/app/build.gradle

@@ -91,8 +91,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001041109
-        versionName "1.4.11-9"
+        versionCode 1001041110
+        versionName "1.4.11-10"
     }
 
     flavorDimensions "default"

ios/NewExpensify/Info.plist

@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.11.9</string>
+	<string>1.4.11.10</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.11.9</string>
+	<string>1.4.11.10</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.4.11-9",
+  "version": "1.4.11-10",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

src/pages/iou/request/step/IOURequestStepScan/index.native.js

@@ -15,6 +15,9 @@ import * as FileUtils from '@libs/fileDownload/FileUtils';
 import Log from '@libs/Log';
 import Navigation from '@libs/Navigation/Navigation';
 import IOURequestStepRoutePropTypes from '@pages/iou/request/step/IOURequestStepRoutePropTypes';
+import StepScreenWrapper from '@pages/iou/request/step/StepScreenWrapper';
+import withFullTransactionOrNotFound from '@pages/iou/request/step/withFullTransactionOrNotFound';
+import withWritableReportOrNotFound from '@pages/iou/request/step/withWritableReportOrNotFound';
 import reportPropTypes from '@pages/reportPropTypes';
 import useTheme from '@styles/themes/useTheme';
 import useThemeStyles from '@styles/useThemeStyles';
@@ -170,8 +173,17 @@ function IOURequestStepScan({
         return null;
     }
 
+    const navigateBack = () => {
+        Navigation.goBack(backTo || ROUTES.HOME);
+    };
+
     return (
-        <View style={styles.flex1}>
+        <StepScreenWrapper
+            headerTitle={translate('common.receipt')}
+            onBackButtonPress={navigateBack}
+            shouldShowWrapper={Boolean(backTo)}
+            testID={IOURequestStepScan.displayName}
+        >
             {cameraPermissionStatus !== RESULTS.GRANTED && (
                 <View style={[styles.cameraView, styles.permissionView, styles.userSelectNone]}>
                     <Hand
@@ -282,12 +294,12 @@ function IOURequestStepScan({
                     />
                 </PressableWithFeedback>
             </View>
-        </View>
+        </StepScreenWrapper>
     );
 }
 
 IOURequestStepScan.defaultProps = defaultProps;
 IOURequestStepScan.propTypes = propTypes;
 IOURequestStepScan.displayName = 'IOURequestStepScan';
 
-export default IOURequestStepScan;
+export default compose(withWritableReportOrNotFound, withFullTransactionOrNotFound)(IOURequestStepScan);