From 8afd8fd060ef9224939c68009096ea7b6273c262 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Tue, 12 Dec 2023 10:51:23 +0000 Subject: [PATCH 1/3] Update version to 1.4.11-10 (cherry picked from commit 2d8523ae3fd8a5b692700a91efb90adac7f1175f) --- android/app/build.gradle | 4 ++-- ios/NewExpensify/Info.plist | 2 +- ios/NewExpensifyTests/Info.plist | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 90993357f5ce..83cbb9474ed1 100644 --- a/android/app/build.gradle +++ b/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" diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 29029a360bc5..e9fa047e311a 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -40,7 +40,7 @@ CFBundleVersion - 1.4.11.9 + 1.4.11.10 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index b64dd0958e5b..b4d5a79abe67 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.4.11.9 + 1.4.11.10 diff --git a/package-lock.json b/package-lock.json index b619e4b71797..05a0ddc771da 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "1.4.11-9", + "version": "1.4.11-10", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "1.4.11-9", + "version": "1.4.11-10", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 1a12630e3fba..c0ed390d2cc3 100644 --- a/package.json +++ b/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.", From 01096fbf35aeacf5d741588b856d42126d1aad4c Mon Sep 17 00:00:00 2001 From: Jules Date: Tue, 12 Dec 2023 10:39:07 +0000 Subject: [PATCH 2/3] Merge pull request #32877 from Expensify/cmartins-fixMissingHeader Fix missing header (cherry picked from commit 83bd22f5f7380daf5137a2de6b864f94898f68b4) --- .../step/IOURequestStepScan/index.native.js | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/pages/iou/request/step/IOURequestStepScan/index.native.js b/src/pages/iou/request/step/IOURequestStepScan/index.native.js index cba808a36845..d8c688a610ae 100644 --- a/src/pages/iou/request/step/IOURequestStepScan/index.native.js +++ b/src/pages/iou/request/step/IOURequestStepScan/index.native.js @@ -15,6 +15,12 @@ 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'; +<<<<<<< HEAD +======= +import StepScreenWrapper from '@pages/iou/request/step/StepScreenWrapper'; +import withFullTransactionOrNotFound from '@pages/iou/request/step/withFullTransactionOrNotFound'; +import withWritableReportOrNotFound from '@pages/iou/request/step/withWritableReportOrNotFound'; +>>>>>>> 83bd22f (Merge pull request #32877 from Expensify/cmartins-fixMissingHeader) import reportPropTypes from '@pages/reportPropTypes'; import useTheme from '@styles/themes/useTheme'; import useThemeStyles from '@styles/useThemeStyles'; @@ -170,8 +176,17 @@ function IOURequestStepScan({ return null; } + const navigateBack = () => { + Navigation.goBack(backTo || ROUTES.HOME); + }; + return ( - + {cameraPermissionStatus !== RESULTS.GRANTED && ( - + ); } From 6be27d413fecb16978de6450b4b9fd1e962b2614 Mon Sep 17 00:00:00 2001 From: Jules Rosser Date: Tue, 12 Dec 2023 11:03:00 +0000 Subject: [PATCH 3/3] resolve conflict --- .../iou/request/step/IOURequestStepScan/index.native.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/pages/iou/request/step/IOURequestStepScan/index.native.js b/src/pages/iou/request/step/IOURequestStepScan/index.native.js index d8c688a610ae..558568f63c5f 100644 --- a/src/pages/iou/request/step/IOURequestStepScan/index.native.js +++ b/src/pages/iou/request/step/IOURequestStepScan/index.native.js @@ -15,12 +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'; -<<<<<<< HEAD -======= import StepScreenWrapper from '@pages/iou/request/step/StepScreenWrapper'; import withFullTransactionOrNotFound from '@pages/iou/request/step/withFullTransactionOrNotFound'; import withWritableReportOrNotFound from '@pages/iou/request/step/withWritableReportOrNotFound'; ->>>>>>> 83bd22f (Merge pull request #32877 from Expensify/cmartins-fixMissingHeader) import reportPropTypes from '@pages/reportPropTypes'; import useTheme from '@styles/themes/useTheme'; import useThemeStyles from '@styles/useThemeStyles'; @@ -305,4 +302,4 @@ IOURequestStepScan.defaultProps = defaultProps; IOURequestStepScan.propTypes = propTypes; IOURequestStepScan.displayName = 'IOURequestStepScan'; -export default IOURequestStepScan; +export default compose(withWritableReportOrNotFound, withFullTransactionOrNotFound)(IOURequestStepScan);