From a4bb0ee96c08c5725a25a823a3e8c061d8f45a60 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Fri, 29 Nov 2024 07:24:58 +0000 Subject: [PATCH 1/3] Update version to 9.0.68-3 (cherry picked from commit e5eb4a446ead16323fb8fe04d41f22a08f5f1dad) --- 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 3f8a5661a2884..95e00aa3b885d 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 1009006802 - versionName "9.0.68-2" + versionCode 1009006803 + versionName "9.0.68-3" // 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 ee748d194a72c..f6a74c7601e8e 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -40,7 +40,7 @@ CFBundleVersion - 9.0.68.2 + 9.0.68.3 FullStory OrgId diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 010703d19d069..9bc5ae7326da8 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 9.0.68.2 + 9.0.68.3 diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist index 6940fad7148f0..1cf34900f76e1 100644 --- a/ios/NotificationServiceExtension/Info.plist +++ b/ios/NotificationServiceExtension/Info.plist @@ -13,7 +13,7 @@ CFBundleShortVersionString 9.0.68 CFBundleVersion - 9.0.68.2 + 9.0.68.3 NSExtension NSExtensionPointIdentifier diff --git a/package-lock.json b/package-lock.json index b4a7bb97c077e..1b9ad96996750 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "9.0.68-2", + "version": "9.0.68-3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "9.0.68-2", + "version": "9.0.68-3", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index fca296b2e1f8e..615e2b7796860 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "9.0.68-2", + "version": "9.0.68-3", "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 f07ed111c706fe3e7e2a6117002d11363a63783d Mon Sep 17 00:00:00 2001 From: Monil Bhavsar Date: Fri, 29 Nov 2024 10:51:06 +0530 Subject: [PATCH 2/3] Merge pull request #53293 from Expensify/aldo_add-showChatPreviewLine Include showChatPreviewLine: true (cherry picked from commit eddc53312879d8765f54d5635699aa4510588f04) (CP triggered by mountiny) --- .../Search/SearchRouter/SearchRouterList.tsx | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/components/Search/SearchRouter/SearchRouterList.tsx b/src/components/Search/SearchRouter/SearchRouterList.tsx index f626a3b34dafb..ed68c47f94d28 100644 --- a/src/components/Search/SearchRouter/SearchRouterList.tsx +++ b/src/components/Search/SearchRouter/SearchRouterList.tsx @@ -137,6 +137,7 @@ function SearchRouterList( return []; } +<<<<<<< HEAD const filteredOptions = OptionsListUtils.getFilteredOptions({ reports: options.reports, personalDetails: options.personalDetails, @@ -144,6 +145,20 @@ function SearchRouterList( maxRecentReportsToShow: 0, includeSelfDM: true, }); +======= + const filteredOptions = OptionsListUtils.getOptions( + { + reports: options.reports, + personalDetails: options.personalDetails, + }, + { + excludeLogins: CONST.EXPENSIFY_EMAILS, + includeSelfDM: true, + showChatPreviewLine: true, + shouldBoldTitleByDefault: false, + }, + ); +>>>>>>> eddc533 (Merge pull request #53293 from Expensify/aldo_add-showChatPreviewLine) // This cast is needed as something is incorrect in types OptionsListUtils.getOptions around l1490 and includeRecentReports types const personalDetailsFromOptions = filteredOptions.personalDetails.map((option) => (option as SearchOption).item); From 4697eaeee2121848e8e1ded55c66459aa854522a Mon Sep 17 00:00:00 2001 From: Vit Horacek <36083550+mountiny@users.noreply.github.com> Date: Fri, 29 Nov 2024 09:49:56 +0100 Subject: [PATCH 3/3] Update SearchRouterList.tsx Resolve merge conflicts --- .../Search/SearchRouter/SearchRouterList.tsx | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/src/components/Search/SearchRouter/SearchRouterList.tsx b/src/components/Search/SearchRouter/SearchRouterList.tsx index ed68c47f94d28..90288276d8df4 100644 --- a/src/components/Search/SearchRouter/SearchRouterList.tsx +++ b/src/components/Search/SearchRouter/SearchRouterList.tsx @@ -137,28 +137,15 @@ function SearchRouterList( return []; } -<<<<<<< HEAD const filteredOptions = OptionsListUtils.getFilteredOptions({ reports: options.reports, personalDetails: options.personalDetails, excludeLogins: CONST.EXPENSIFY_EMAILS, maxRecentReportsToShow: 0, includeSelfDM: true, + showChatPreviewLine: true, + shouldBoldTitleByDefault: false, }); -======= - const filteredOptions = OptionsListUtils.getOptions( - { - reports: options.reports, - personalDetails: options.personalDetails, - }, - { - excludeLogins: CONST.EXPENSIFY_EMAILS, - includeSelfDM: true, - showChatPreviewLine: true, - shouldBoldTitleByDefault: false, - }, - ); ->>>>>>> eddc533 (Merge pull request #53293 from Expensify/aldo_add-showChatPreviewLine) // This cast is needed as something is incorrect in types OptionsListUtils.getOptions around l1490 and includeRecentReports types const personalDetailsFromOptions = filteredOptions.personalDetails.map((option) => (option as SearchOption).item);