From 90b0174343c06ed0a23f4423ea3b3edf859f4dd1 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Mon, 12 Feb 2024 13:09:42 +0000 Subject: [PATCH 1/3] Update version to 1.4.39-8 (cherry picked from commit 33ef52daf0b0041882f255c7973a39315ab1b3f9) --- android/app/build.gradle | 4 ++-- ios/NewExpensify/Info.plist | 2 +- ios/NewExpensifyTests/Info.plist | 2 +- ios/NotificationServiceExtension/Info.plist | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index ed7b2f568b93..b968fe3549db 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -98,8 +98,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001043907 - versionName "1.4.39-7" + versionCode 1001043908 + versionName "1.4.39-8" } flavorDimensions "default" diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 4f571739ecc7..b2fd5dec9172 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -40,7 +40,7 @@ CFBundleVersion - 1.4.39.7 + 1.4.39.8 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index bc29fdff60c2..d8d6e7bd1244 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.4.39.7 + 1.4.39.8 diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist index b54ddc36ddf0..77c596090752 100644 --- a/ios/NotificationServiceExtension/Info.plist +++ b/ios/NotificationServiceExtension/Info.plist @@ -13,7 +13,7 @@ CFBundleShortVersionString 1.4.39 CFBundleVersion - 1.4.39.7 + 1.4.39.8 NSExtension NSExtensionPointIdentifier diff --git a/package-lock.json b/package-lock.json index d983835dd5ba..68451540e7d5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "1.4.39-7", + "version": "1.4.39-8", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "1.4.39-7", + "version": "1.4.39-8", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index d069d623cb2f..a2905d80bff6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.4.39-7", + "version": "1.4.39-8", "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 4638aa6d154d50bc492187d55a2711876c22f69b Mon Sep 17 00:00:00 2001 From: Alex Beaman Date: Mon, 12 Feb 2024 15:05:54 +0200 Subject: [PATCH 2/3] Merge pull request #36329 from Expensify/beaman-add-navigation-fix-back Add nav backup back so we can CP to staging (cherry picked from commit 4c985890a91e337e47f03396b7cfd5e3a626c34b) --- src/pages/iou/request/step/IOURequestStepDescription.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pages/iou/request/step/IOURequestStepDescription.js b/src/pages/iou/request/step/IOURequestStepDescription.js index 25477170f505..23bca52047ce 100644 --- a/src/pages/iou/request/step/IOURequestStepDescription.js +++ b/src/pages/iou/request/step/IOURequestStepDescription.js @@ -17,7 +17,11 @@ import updateMultilineInputRange from '@libs/updateMultilineInputRange'; import * as IOU from '@userActions/IOU'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; +<<<<<<< HEAD import ROUTES from '@src/ROUTES'; +======= +import {policyPropTypes} from '@src/pages/workspace/withPolicy'; +>>>>>>> 4c98589 (Merge pull request #36329 from Expensify/beaman-add-navigation-fix-back) import IOURequestStepRoutePropTypes from './IOURequestStepRoutePropTypes'; import StepScreenWrapper from './StepScreenWrapper'; import withFullTransactionOrNotFound from './withFullTransactionOrNotFound'; @@ -72,7 +76,7 @@ function IOURequestStepDescription({ ); const navigateBack = () => { - Navigation.goBack(backTo || ROUTES.HOME); + Navigation.goBack(backTo); }; /** From 9edc9177b22a2210e6610962bf1ee9070fb665e7 Mon Sep 17 00:00:00 2001 From: Alex Beaman Date: Mon, 12 Feb 2024 15:12:26 +0200 Subject: [PATCH 3/3] Fix merge conflicts --- src/pages/iou/request/step/IOURequestStepDescription.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/pages/iou/request/step/IOURequestStepDescription.js b/src/pages/iou/request/step/IOURequestStepDescription.js index 23bca52047ce..d8cfc03c4cfb 100644 --- a/src/pages/iou/request/step/IOURequestStepDescription.js +++ b/src/pages/iou/request/step/IOURequestStepDescription.js @@ -17,11 +17,6 @@ import updateMultilineInputRange from '@libs/updateMultilineInputRange'; import * as IOU from '@userActions/IOU'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; -<<<<<<< HEAD -import ROUTES from '@src/ROUTES'; -======= -import {policyPropTypes} from '@src/pages/workspace/withPolicy'; ->>>>>>> 4c98589 (Merge pull request #36329 from Expensify/beaman-add-navigation-fix-back) import IOURequestStepRoutePropTypes from './IOURequestStepRoutePropTypes'; import StepScreenWrapper from './StepScreenWrapper'; import withFullTransactionOrNotFound from './withFullTransactionOrNotFound';