From 8b3bcc6a97d252b8c58da836904932ed65c9a96f Mon Sep 17 00:00:00 2001 From: OSBotify Date: Fri, 5 Jul 2024 11:39:02 +0000 Subject: [PATCH 1/3] Update version to 9.0.4-6 (cherry picked from commit c80e8b65eb8bb5f218d50a59efb2a65f22d7c527) --- 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 cb4c7f28e265..271acff8a317 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -107,8 +107,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1009000405 - versionName "9.0.4-5" + versionCode 1009000406 + versionName "9.0.4-6" // 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 dc9e22924622..21ce8a3b09cb 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -40,7 +40,7 @@ CFBundleVersion - 9.0.4.5 + 9.0.4.6 FullStory OrgId diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 94945a38c2cd..4ff934cbfbe0 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 9.0.4.5 + 9.0.4.6 diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist index 06208839de66..47194fd0b2db 100644 --- a/ios/NotificationServiceExtension/Info.plist +++ b/ios/NotificationServiceExtension/Info.plist @@ -13,7 +13,7 @@ CFBundleShortVersionString 9.0.4 CFBundleVersion - 9.0.4.5 + 9.0.4.6 NSExtension NSExtensionPointIdentifier diff --git a/package-lock.json b/package-lock.json index 4020423b9875..67f2cdcb441d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "9.0.4-5", + "version": "9.0.4-6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "9.0.4-5", + "version": "9.0.4-6", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 9ff3dd1dbf29..d64b573709cd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "9.0.4-5", + "version": "9.0.4-6", "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 1bf731906c43a615c812a2e6561ccc2ec5a4236b Mon Sep 17 00:00:00 2001 From: Vit Horacek <36083550+mountiny@users.noreply.github.com> Date: Fri, 5 Jul 2024 11:36:18 +0100 Subject: [PATCH 2/3] Merge pull request #44882 from nkdengineer/fix/44801 [CP Staging] Fix select all checkbox is not checked when all items are checked (cherry picked from commit 87f5cdd7f19ceb014b26c0e0048593f5ac0eab49) --- src/components/SelectionList/BaseSelectionList.tsx | 2 +- src/libs/SearchUtils.ts | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/components/SelectionList/BaseSelectionList.tsx b/src/components/SelectionList/BaseSelectionList.tsx index 503f7d11d2da..ae70e5525393 100644 --- a/src/components/SelectionList/BaseSelectionList.tsx +++ b/src/components/SelectionList/BaseSelectionList.tsx @@ -166,7 +166,7 @@ function BaseSelectionList( itemLayouts.push({length: fullItemHeight, offset}); offset += fullItemHeight; - if (item.isSelected && !selectedOptions.find((option) => option.text === item.text)) { + if (item.isSelected && !selectedOptions.find((option) => option.keyForList === item.keyForList)) { selectedOptions.push(item); } }); diff --git a/src/libs/SearchUtils.ts b/src/libs/SearchUtils.ts index a76e14fe0290..10661945154d 100644 --- a/src/libs/SearchUtils.ts +++ b/src/libs/SearchUtils.ts @@ -167,6 +167,12 @@ function getReportSections(data: OnyxTypes.SearchResults['data'], metadata: Onyx reportIDToTransactions[reportKey] = { ...value, +<<<<<<< HEAD +======= + keyForList: value.reportID, + from: data.personalDetailsList?.[value.accountID], + to: data.personalDetailsList?.[value.managerID], +>>>>>>> 87f5cdd7 (Merge pull request #44882 from nkdengineer/fix/44801) transactions, }; } else if (key.startsWith(ONYXKEYS.COLLECTION.TRANSACTION)) { From 16c2f5350b1f30684ec2768aa403fdbabf84bce8 Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Fri, 5 Jul 2024 12:41:42 +0100 Subject: [PATCH 3/3] Resolve merge conflict --- src/libs/SearchUtils.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/libs/SearchUtils.ts b/src/libs/SearchUtils.ts index 10661945154d..d033ae2512ed 100644 --- a/src/libs/SearchUtils.ts +++ b/src/libs/SearchUtils.ts @@ -167,12 +167,7 @@ function getReportSections(data: OnyxTypes.SearchResults['data'], metadata: Onyx reportIDToTransactions[reportKey] = { ...value, -<<<<<<< HEAD -======= keyForList: value.reportID, - from: data.personalDetailsList?.[value.accountID], - to: data.personalDetailsList?.[value.managerID], ->>>>>>> 87f5cdd7 (Merge pull request #44882 from nkdengineer/fix/44801) transactions, }; } else if (key.startsWith(ONYXKEYS.COLLECTION.TRANSACTION)) {