From 55cd0940288f3a771d6a9976ff8e98d1b9bf72de Mon Sep 17 00:00:00 2001 From: OSBotify Date: Fri, 31 Jan 2025 02:32:59 +0000 Subject: [PATCH 1/3] Update version to 9.0.92-5 (cherry picked from commit c618f56684fdbb918c56739bd78fbbb7b4c1c53b) --- 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 58bae02fb97b..5efbff8b4ca3 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -110,8 +110,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1009009204 - versionName "9.0.92-4" + versionCode 1009009205 + versionName "9.0.92-5" // 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 6b8d4d97685a..7365053cdb84 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -44,7 +44,7 @@ CFBundleVersion - 9.0.92.4 + 9.0.92.5 FullStory OrgId diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 14c14671b8f4..5b3a9c98f806 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 9.0.92.4 + 9.0.92.5 diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist index e9a1cb28f9e1..d97d4e17055c 100644 --- a/ios/NotificationServiceExtension/Info.plist +++ b/ios/NotificationServiceExtension/Info.plist @@ -13,7 +13,7 @@ CFBundleShortVersionString 9.0.92 CFBundleVersion - 9.0.92.4 + 9.0.92.5 NSExtension NSExtensionPointIdentifier diff --git a/package-lock.json b/package-lock.json index 87a94a05eb4e..434352a0d09a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "9.0.92-4", + "version": "9.0.92-5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "9.0.92-4", + "version": "9.0.92-5", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 6581436c739f..01deca956786 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "9.0.92-4", + "version": "9.0.92-5", "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 9fcf530ff891dd9059e18c4c8a041aa535610968 Mon Sep 17 00:00:00 2001 From: Yuwen Memon Date: Thu, 30 Jan 2025 18:29:18 -0800 Subject: [PATCH 2/3] Merge pull request #56129 from Expensify/yuwen-mj-fallback-chat-report-id [CP Staging][No QA] fix: default chat report id (REDUX) (cherry picked from commit dd3e74ba6e75a16aee21c7c6e3f0300cf0223482) (CP triggered by yuwenmemon) --- src/components/SettlementButton/index.tsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/SettlementButton/index.tsx b/src/components/SettlementButton/index.tsx index 548b265d9837..aa9a1458b268 100644 --- a/src/components/SettlementButton/index.tsx +++ b/src/components/SettlementButton/index.tsx @@ -69,7 +69,11 @@ function SettlementButton({ const {translate} = useLocalize(); const {isOffline} = useNetwork(); // The app would crash due to subscribing to the entire report collection if chatReportID is an empty string. So we should have a fallback ID here. +<<<<<<< HEAD const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`); +======= + const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${chatReportID || CONST.DEFAULT_NUMBER_ID}`); +>>>>>>> dd3e74b (Merge pull request #56129 from Expensify/yuwen-mj-fallback-chat-report-id) const [isUserValidated] = useOnyx(ONYXKEYS.USER, {selector: (user) => !!user?.validated}); const policyEmployeeAccountIDs = policyID ? getPolicyEmployeeAccountIDs(policyID) : []; const reportBelongsToWorkspace = policyID ? doesReportBelongToWorkspace(chatReport, policyEmployeeAccountIDs, policyID) : false; From 84c6f2b353993b11b975b4994138eba407e75e6b Mon Sep 17 00:00:00 2001 From: Yuwen Memon Date: Thu, 30 Jan 2025 18:41:48 -0800 Subject: [PATCH 3/3] Fix conflicts --- src/components/SettlementButton/index.tsx | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/components/SettlementButton/index.tsx b/src/components/SettlementButton/index.tsx index aa9a1458b268..667826d29f8b 100644 --- a/src/components/SettlementButton/index.tsx +++ b/src/components/SettlementButton/index.tsx @@ -69,11 +69,7 @@ function SettlementButton({ const {translate} = useLocalize(); const {isOffline} = useNetwork(); // The app would crash due to subscribing to the entire report collection if chatReportID is an empty string. So we should have a fallback ID here. -<<<<<<< HEAD - const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`); -======= const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${chatReportID || CONST.DEFAULT_NUMBER_ID}`); ->>>>>>> dd3e74b (Merge pull request #56129 from Expensify/yuwen-mj-fallback-chat-report-id) const [isUserValidated] = useOnyx(ONYXKEYS.USER, {selector: (user) => !!user?.validated}); const policyEmployeeAccountIDs = policyID ? getPolicyEmployeeAccountIDs(policyID) : []; const reportBelongsToWorkspace = policyID ? doesReportBelongToWorkspace(chatReport, policyEmployeeAccountIDs, policyID) : false;