From 8045c2e3f8aea8615f7efd88399ed74cb4e8ef98 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Mon, 22 Apr 2024 06:45:33 +0000 Subject: [PATCH 1/3] Update version to 1.4.63-19 (cherry picked from commit 94147d40aee9bcb36b65af31c89d53d37ea191de) --- 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 17ba4ecd74a1..057eba1ff8e1 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 1001046318 - versionName "1.4.63-18" + versionCode 1001046319 + versionName "1.4.63-19" // Supported language variants must be declared here to avoid from being removed during the compilation. // This also helps us to not include unnecessary language variants in the APK. resConfigs "en", "es" diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index f29ec6ee74ca..2dab5b55cd38 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -40,7 +40,7 @@ CFBundleVersion - 1.4.63.18 + 1.4.63.19 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index e9f32ec4c683..85738221b366 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.4.63.18 + 1.4.63.19 diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist index 562e247bc742..3111ae0c12f0 100644 --- a/ios/NotificationServiceExtension/Info.plist +++ b/ios/NotificationServiceExtension/Info.plist @@ -13,7 +13,7 @@ CFBundleShortVersionString 1.4.63 CFBundleVersion - 1.4.63.18 + 1.4.63.19 NSExtension NSExtensionPointIdentifier diff --git a/package-lock.json b/package-lock.json index 8df7f4fcef7f..9b8a1c3b45aa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "1.4.63-18", + "version": "1.4.63-19", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "1.4.63-18", + "version": "1.4.63-19", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 60ab61fb40f8..2b2e8d629d7f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.4.63-18", + "version": "1.4.63-19", "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 e1560fd0d8c6b955e8c1e804f7ee36a180c0abc7 Mon Sep 17 00:00:00 2001 From: Alex Beaman Date: Mon, 22 Apr 2024 08:43:02 +0200 Subject: [PATCH 2/3] Merge pull request #40648 from ishpaul777/fix/40549 [CP Staging] fixes track whispers follow up minor issues (cherry picked from commit 4e922f1400a5da439acfeaa33ee3feeb124c43eb) --- .../MoneyRequestConfirmationList.tsx | 20 +++++++++++++++++++ ...yForRefactorRequestParticipantsSelector.js | 11 +++++++--- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/components/MoneyRequestConfirmationList.tsx b/src/components/MoneyRequestConfirmationList.tsx index 4b3e4096484f..b2d7f09083a3 100755 --- a/src/components/MoneyRequestConfirmationList.tsx +++ b/src/components/MoneyRequestConfirmationList.tsx @@ -607,6 +607,7 @@ function MoneyRequestConfirmationList({ )} +<<<<<<< HEAD {/* eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing */} {receiptImage || receiptThumbnail ? ( +======= + {!isDistanceRequest && + // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing + (receiptImage || receiptThumbnail + ? receiptThumbnailContent + : // The empty receipt component should only show for IOU Requests of a paid policy ("Team" or "Corporate") + PolicyUtils.isPaidGroupPolicy(policy) && + !isDistanceRequest && + iouType === CONST.IOU.TYPE.REQUEST && ( + + Navigation.navigate( + ROUTES.MONEY_REQUEST_STEP_SCAN.getRoute(CONST.IOU.ACTION.CREATE, iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams()), + ) + } + /> + ))} + {primaryFields} +>>>>>>> 4e922f14 (Merge pull request #40648 from ishpaul777/fix/40549) {!shouldShowAllFields && (