From a6cd6e80822ae380c291f8d92acb113d2279de25 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Thu, 30 May 2024 20:42:21 +0000 Subject: [PATCH 1/3] Update version to 1.4.77-11 (cherry picked from commit 24d525fedcd05671fe210749d296995a0d049c4f) --- 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 0c8224f0f53..88119d73f46 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 1001047709 - versionName "1.4.77-9" + versionCode 1001047711 + versionName "1.4.77-11" // 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 6d6f7848660..028305675a1 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -40,7 +40,7 @@ CFBundleVersion - 1.4.77.9 + 1.4.77.11 FullStory OrgId diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 6da4b17ecdf..8b69467b1cd 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.4.77.9 + 1.4.77.11 diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist index 651565d3ef4..79180910920 100644 --- a/ios/NotificationServiceExtension/Info.plist +++ b/ios/NotificationServiceExtension/Info.plist @@ -13,7 +13,7 @@ CFBundleShortVersionString 1.4.77 CFBundleVersion - 1.4.77.9 + 1.4.77.11 NSExtension NSExtensionPointIdentifier diff --git a/package-lock.json b/package-lock.json index 8b98f4bac4e..bceedf66d7e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "1.4.77-9", + "version": "1.4.77-11", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "1.4.77-9", + "version": "1.4.77-11", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 2b8681cb409..0a6eafd1d9b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.4.77-9", + "version": "1.4.77-11", "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 851f4d8cdfda3bb8c4ccdbb7cc7f495ca1d63925 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Thu, 30 May 2024 09:28:30 -0600 Subject: [PATCH 2/3] Merge pull request #42805 from Krishna2323/krishna2323/issue/42751 [CP Staging] fix: Chat - Display Name Appears Black and Members Not Ticked in Group Preview (cherry picked from commit 99b0563aab8bcaad8f8b12db57f6dbe413965a2b) --- src/components/SelectionList/BaseSelectionList.tsx | 3 +-- src/libs/ReportUtils.ts | 13 +++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/components/SelectionList/BaseSelectionList.tsx b/src/components/SelectionList/BaseSelectionList.tsx index 0e8b3deae79..6478319f89d 100644 --- a/src/components/SelectionList/BaseSelectionList.tsx +++ b/src/components/SelectionList/BaseSelectionList.tsx @@ -426,8 +426,7 @@ function BaseSelectionList( shouldPreventDefaultFocusOnSelectRow={shouldPreventDefaultFocusOnSelectRow} // We're already handling the Enter key press in the useKeyboardShortcut hook, so we don't want the list item to submit the form shouldPreventEnterKeySubmit - // Change this because of lint - rightHandSideComponent={rightHandSideComponent && (typeof rightHandSideComponent === 'function' ? rightHandSideComponent({} as TItem) : rightHandSideComponent)} + rightHandSideComponent={rightHandSideComponent} keyForList={item.keyForList ?? ''} isMultilineSupported={isRowMultilineSupported} onFocus={() => { diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index 7939ef87604..1499f8f8182 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -81,7 +81,12 @@ import * as ReportActionsUtils from './ReportActionsUtils'; import StringUtils from './StringUtils'; import * as TransactionUtils from './TransactionUtils'; import * as Url from './Url'; +<<<<<<< HEAD import type * as UserUtils from './UserUtils'; +======= +import type {AvatarSource} from './UserUtils'; +import * as UserUtils from './UserUtils'; +>>>>>>> 99b0563 (Merge pull request #42805 from Krishna2323/krishna2323/issue/42751) type AvatarRange = 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18; @@ -117,7 +122,7 @@ type SpendBreakdown = { totalDisplaySpend: number; }; -type ParticipantDetails = [number, string, UserUtils.AvatarSource, UserUtils.AvatarSource]; +type ParticipantDetails = [number, string, AvatarSource, AvatarSource]; type OptimisticAddCommentReportAction = Pick< ReportAction, @@ -587,7 +592,7 @@ function getLastUpdatedReport(): OnyxEntry { return lastUpdatedReport; } -function getCurrentUserAvatar(): UserUtils.AvatarSource | undefined { +function getCurrentUserAvatar(): AvatarSource | undefined { return currentUserPersonalDetails?.avatar; } @@ -1714,7 +1719,7 @@ function getDefaultWorkspaceAvatarTestID(workspaceName: string): string { return !alphaNumeric ? defaultAvatarBuildingIconTestID : `SvgDefaultAvatar_${alphaNumeric[0]} Icon`; } -function getWorkspaceAvatar(report: OnyxEntry): UserUtils.AvatarSource { +function getWorkspaceAvatar(report: OnyxEntry): AvatarSource { const workspaceName = getPolicyName(report, false, allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]); const avatar = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatarURL ?? ''; return !isEmpty(avatar) ? avatar : getDefaultWorkspaceAvatar(workspaceName); @@ -1921,7 +1926,7 @@ function getParticipants(reportID: string) { function getIcons( report: OnyxEntry, personalDetails: OnyxCollection, - defaultIcon: UserUtils.AvatarSource | null = null, + defaultIcon: AvatarSource | null = null, defaultName = '', defaultAccountID = -1, policy: OnyxEntry = null, From 3f22789dc18ab91bc12eedb645b8ff9ce272a3db Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Thu, 30 May 2024 14:49:41 -0600 Subject: [PATCH 3/3] resolve conflicts --- src/libs/ReportUtils.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index 1499f8f8182..99527ee8c18 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -81,12 +81,7 @@ import * as ReportActionsUtils from './ReportActionsUtils'; import StringUtils from './StringUtils'; import * as TransactionUtils from './TransactionUtils'; import * as Url from './Url'; -<<<<<<< HEAD -import type * as UserUtils from './UserUtils'; -======= import type {AvatarSource} from './UserUtils'; -import * as UserUtils from './UserUtils'; ->>>>>>> 99b0563 (Merge pull request #42805 from Krishna2323/krishna2323/issue/42751) type AvatarRange = 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18;