From c3280b1f2140338efbaf31485890027bdcd72cb3 Mon Sep 17 00:00:00 2001 From: Alex Beaman Date: Mon, 29 Apr 2024 12:24:16 +0300 Subject: [PATCH 1/9] Remove old policy avatar key --- src/types/onyx/Policy.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/types/onyx/Policy.ts b/src/types/onyx/Policy.ts index ef4960818946..9f9bf8237a78 100644 --- a/src/types/onyx/Policy.ts +++ b/src/types/onyx/Policy.ts @@ -299,7 +299,6 @@ type Policy = OnyxCommon.OnyxValueWithOfflineFeedback< outputCurrency: string; /** The URL for the policy avatar */ - avatar?: string; avatarURL?: string; /** Error objects keyed by field name containing errors keyed by microtime */ From 0e2eb54090cfd8b55171de8047c5d89bd2b534ae Mon Sep 17 00:00:00 2001 From: Alex Beaman Date: Mon, 29 Apr 2024 12:24:31 +0300 Subject: [PATCH 2/9] Use new policy avatar url key --- src/components/WorkspaceSwitcherButton.tsx | 2 +- src/pages/WorkspaceSwitcherPage/index.tsx | 2 +- src/pages/workspace/WorkspaceAvatar.tsx | 2 +- src/pages/workspace/WorkspaceInitialPage.tsx | 2 +- src/pages/workspace/WorkspaceProfilePage.tsx | 12 ++++++------ src/pages/workspace/WorkspaceProfileSharePage.tsx | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/components/WorkspaceSwitcherButton.tsx b/src/components/WorkspaceSwitcherButton.tsx index 2b9b3480f96d..ad3e454688b6 100644 --- a/src/components/WorkspaceSwitcherButton.tsx +++ b/src/components/WorkspaceSwitcherButton.tsx @@ -31,7 +31,7 @@ function WorkspaceSwitcherButton({policy}: WorkspaceSwitcherButtonProps) { return {source: Expensicons.ExpensifyAppIcon, name: CONST.WORKSPACE_SWITCHER.NAME, type: CONST.ICON_TYPE_AVATAR}; } - const avatar = policy?.avatar ? policy.avatar : getDefaultWorkspaceAvatar(policy?.name); + const avatar = policy?.avatarURL ? policy.avatarURL : getDefaultWorkspaceAvatar(policy?.name); return { source: avatar, name: policy?.name ?? '', diff --git a/src/pages/WorkspaceSwitcherPage/index.tsx b/src/pages/WorkspaceSwitcherPage/index.tsx index b90d129f91eb..7b45ec1991e5 100644 --- a/src/pages/WorkspaceSwitcherPage/index.tsx +++ b/src/pages/WorkspaceSwitcherPage/index.tsx @@ -114,7 +114,7 @@ function WorkspaceSwitcherPage() { brickRoadIndicator: getIndicatorTypeForPolicy(policy?.id), icons: [ { - source: policy?.avatar ? policy.avatar : ReportUtils.getDefaultWorkspaceAvatar(policy?.name), + source: policy?.avatarURL ? policy.avatarURL : ReportUtils.getDefaultWorkspaceAvatar(policy?.name), fallbackIcon: Expensicons.FallbackWorkspaceAvatar, name: policy?.name, type: CONST.ICON_TYPE_WORKSPACE, diff --git a/src/pages/workspace/WorkspaceAvatar.tsx b/src/pages/workspace/WorkspaceAvatar.tsx index 9ab9d0af25d5..f1aa5235b42f 100644 --- a/src/pages/workspace/WorkspaceAvatar.tsx +++ b/src/pages/workspace/WorkspaceAvatar.tsx @@ -19,7 +19,7 @@ type WorkspaceAvatarOnyxProps = { type WorkspaceAvatarProps = WorkspaceAvatarOnyxProps & StackScreenProps; function WorkspaceAvatar({policy, isLoadingApp = true}: WorkspaceAvatarProps) { - const avatarURL = policy?.avatar ?? '' ? policy?.avatar ?? '' : ReportUtils.getDefaultWorkspaceAvatar(policy?.name ?? ''); + const avatarURL = policy?.avatarURL ?? '' ? policy?.avatarURL ?? '' : ReportUtils.getDefaultWorkspaceAvatar(policy?.name ?? ''); return ( ), - [policy?.avatar, policyName, styles.alignSelfCenter, styles.avatarXLarge], + [policy?.avatarURL, policyName, styles.alignSelfCenter, styles.avatarXLarge], ); const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false); @@ -129,7 +129,7 @@ function WorkspaceProfilePage({policy, currencyList = {}, route}: WorkSpaceProfi /> Navigation.navigate(ROUTES.WORKSPACE_AVATAR.getRoute(policy?.id ?? ''))} - source={policy?.avatar ?? ''} + source={policy?.avatarURL ?? ''} size={CONST.AVATAR_SIZE.XLARGE} avatarStyle={styles.avatarXLarge} enablePreview @@ -143,14 +143,14 @@ function WorkspaceProfilePage({policy, currencyList = {}, route}: WorkSpaceProfi styles.sectionMenuItemTopDescription, ]} editIconStyle={styles.smallEditIconWorkspace} - isUsingDefaultAvatar={!policy?.avatar ?? null} + isUsingDefaultAvatar={!policy?.avatarURL ?? false} onImageSelected={(file) => Policy.updateWorkspaceAvatar(policy?.id ?? '', file as File)} onImageRemoved={() => Policy.deleteWorkspaceAvatar(policy?.id ?? '')} editorMaskImage={Expensicons.ImageCropSquareMask} - pendingAction={policy?.pendingFields?.avatar} + pendingAction={policy?.pendingFields?.avatarURL} errors={policy?.errorFields?.avatar} onErrorClose={() => Policy.clearAvatarErrors(policy?.id ?? '')} - previewSource={UserUtils.getFullSizeAvatar(policy?.avatar ?? '')} + previewSource={UserUtils.getFullSizeAvatar(policy?.avatarURL ?? '')} headerTitle={translate('workspace.common.workspaceAvatar')} originalFileName={policy?.originalFileName} disabled={readOnly} diff --git a/src/pages/workspace/WorkspaceProfileSharePage.tsx b/src/pages/workspace/WorkspaceProfileSharePage.tsx index 5aab39f8e019..3c714a885245 100644 --- a/src/pages/workspace/WorkspaceProfileSharePage.tsx +++ b/src/pages/workspace/WorkspaceProfileSharePage.tsx @@ -62,7 +62,7 @@ function WorkspaceProfileSharePage({policy}: WithPolicyProps) { ref={qrCodeRef} url={url} title={policyName} - logo={(policy?.avatar ? policy.avatar : expensifyLogo) as ImageSourcePropType} + logo={(policy?.avatarURL ? policy.avatarURL : expensifyLogo) as ImageSourcePropType} logoRatio={CONST.QR.DEFAULT_LOGO_SIZE_RATIO} logoMarginRatio={CONST.QR.DEFAULT_LOGO_MARGIN_RATIO} /> From 435254916decdb338f7b4492102e7f4efc399f4e Mon Sep 17 00:00:00 2001 From: Alex Beaman Date: Mon, 29 Apr 2024 12:25:43 +0300 Subject: [PATCH 3/9] Use new policy avatarURL key --- src/pages/home/report/ReportActionItemCreated.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/home/report/ReportActionItemCreated.tsx b/src/pages/home/report/ReportActionItemCreated.tsx index 5446cd35e835..d465a1b67888 100644 --- a/src/pages/home/report/ReportActionItemCreated.tsx +++ b/src/pages/home/report/ReportActionItemCreated.tsx @@ -110,7 +110,7 @@ export default withOnyx prevProps.policy?.name === nextProps.policy?.name && - prevProps.policy?.avatar === nextProps.policy?.avatar && + prevProps.policy?.avatarURL === nextProps.policy?.avatarURL && prevProps.report?.stateNum === nextProps.report?.stateNum && prevProps.report?.statusNum === nextProps.report?.statusNum && prevProps.report?.lastReadTime === nextProps.report?.lastReadTime && From ab70bd04703e4bdfaa8faa39ac09e891fb705037 Mon Sep 17 00:00:00 2001 From: Alex Beaman Date: Mon, 29 Apr 2024 12:32:09 +0300 Subject: [PATCH 4/9] Update few more avatarURL keys --- .../sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx | 2 +- src/pages/workspace/WorkspacesListPage.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx index d74ab3fbfb58..1ee6ca9864e9 100644 --- a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx +++ b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx @@ -89,7 +89,7 @@ const policySelector = (policy: OnyxEntry): PolicySelector => role: policy.role, isPolicyExpenseChatEnabled: policy.isPolicyExpenseChatEnabled, pendingAction: policy.pendingAction, - avatar: policy.avatar, + avatar: policy.avatarURL, name: policy.name, }) as PolicySelector; diff --git a/src/pages/workspace/WorkspacesListPage.tsx b/src/pages/workspace/WorkspacesListPage.tsx index f0cb062fb4b3..892eb966e551 100755 --- a/src/pages/workspace/WorkspacesListPage.tsx +++ b/src/pages/workspace/WorkspacesListPage.tsx @@ -333,7 +333,7 @@ function WorkspacesListPage({policies, reimbursementAccount, reports, session}: } return { title: policy.name, - icon: policy.avatar ? policy.avatar : ReportUtils.getDefaultWorkspaceAvatar(policy.name), + icon: policy.avatarURL ? policy.avatarURL : ReportUtils.getDefaultWorkspaceAvatar(policy.name), action: () => Navigation.navigate(ROUTES.WORKSPACE_INITIAL.getRoute(policy.id)), brickRoadIndicator: reimbursementAccountBrickRoadIndicator ?? PolicyUtils.getPolicyBrickRoadIndicatorStatus(policy), pendingAction: policy.pendingAction, @@ -345,7 +345,7 @@ function WorkspacesListPage({policies, reimbursementAccount, reports, session}: dismissWorkspaceError(policy.id, policy.pendingAction); }, disabled: policy.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE, - iconType: policy.avatar ? CONST.ICON_TYPE_AVATAR : CONST.ICON_TYPE_ICON, + iconType: policy.avatarURL ? CONST.ICON_TYPE_AVATAR : CONST.ICON_TYPE_ICON, iconFill: theme.textLight, fallbackIcon: Expensicons.FallbackWorkspaceAvatar, policyID: policy.id, From c412f38530d661c9a8846f1413434e4cb92ee467 Mon Sep 17 00:00:00 2001 From: Alex Beaman Date: Mon, 29 Apr 2024 12:32:34 +0300 Subject: [PATCH 5/9] Update remaining avatar key to avatarURL --- src/hooks/useReportIDs.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hooks/useReportIDs.tsx b/src/hooks/useReportIDs.tsx index 58d4e42cd83b..4060e4bf863d 100644 --- a/src/hooks/useReportIDs.tsx +++ b/src/hooks/useReportIDs.tsx @@ -97,7 +97,7 @@ const policySelector = (policy: OnyxEntry): PolicySelector => (policy && { type: policy.type, name: policy.name, - avatar: policy.avatar, + avatar: policy.avatarURL, employeeList: policy.employeeList, }) as PolicySelector; From 06f4dab76beb109fea28ac033eb8a6f0c598e67d Mon Sep 17 00:00:00 2001 From: Alex Beaman Date: Mon, 29 Apr 2024 12:43:39 +0300 Subject: [PATCH 6/9] Update avatar to avatarURL key for policy --- src/hooks/useReportIDs.tsx | 4 ++-- src/libs/ReportUtils.ts | 6 +++--- src/libs/actions/Policy.ts | 24 ++++++++++++------------ 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/hooks/useReportIDs.tsx b/src/hooks/useReportIDs.tsx index 4060e4bf863d..c1503595fa24 100644 --- a/src/hooks/useReportIDs.tsx +++ b/src/hooks/useReportIDs.tsx @@ -13,7 +13,7 @@ import useCurrentReportID from './useCurrentReportID'; import useCurrentUserPersonalDetails from './useCurrentUserPersonalDetails'; type ChatReportSelector = OnyxTypes.Report & {isUnreadWithMention: boolean}; -type PolicySelector = Pick; +type PolicySelector = Pick; type ReportActionsSelector = Array>; type ReportIDsContextProviderProps = { @@ -97,7 +97,7 @@ const policySelector = (policy: OnyxEntry): PolicySelector => (policy && { type: policy.type, name: policy.name, - avatar: policy.avatarURL, + avatarURL: policy.avatarURL, employeeList: policy.employeeList, }) as PolicySelector; diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index a0da34416aad..0842e4e0c827 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -1640,7 +1640,7 @@ function getDefaultWorkspaceAvatarTestID(workspaceName: string): string { function getWorkspaceAvatar(report: OnyxEntry): UserUtils.AvatarSource { const workspaceName = getPolicyName(report, false, allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]); - const avatar = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatar ?? ''; + const avatar = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatarURL ?? ''; return !isEmpty(avatar) ? avatar : getDefaultWorkspaceAvatar(workspaceName); } @@ -1704,8 +1704,8 @@ function getIconsForParticipants(participants: number[], personalDetails: OnyxCo */ function getWorkspaceIcon(report: OnyxEntry, policy: OnyxEntry = null): Icon { const workspaceName = getPolicyName(report, false, policy); - const policyExpenseChatAvatarSource = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatar - ? allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatar + const policyExpenseChatAvatarSource = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatarURL + ? allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatarURL : getDefaultWorkspaceAvatar(workspaceName); const workspaceIcon: Icon = { diff --git a/src/libs/actions/Policy.ts b/src/libs/actions/Policy.ts index 6d457f150fe6..52d255ef2770 100644 --- a/src/libs/actions/Policy.ts +++ b/src/libs/actions/Policy.ts @@ -323,7 +323,7 @@ function deleteWorkspace(policyID: string, policyName: string) { onyxMethod: Onyx.METHOD.MERGE, key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`, value: { - avatar: '', + avatarURL: '', pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE, errors: null, }, @@ -1499,13 +1499,13 @@ function updateWorkspaceAvatar(policyID: string, file: File) { onyxMethod: Onyx.METHOD.MERGE, key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`, value: { - avatar: file.uri, + avatarURL: file.uri, originalFileName: file.name, errorFields: { avatar: null, }, pendingFields: { - avatar: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, + avatarURL: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, }, }, }, @@ -1516,7 +1516,7 @@ function updateWorkspaceAvatar(policyID: string, file: File) { key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`, value: { pendingFields: { - avatar: null, + avatarURL: null, }, }, }, @@ -1526,7 +1526,7 @@ function updateWorkspaceAvatar(policyID: string, file: File) { onyxMethod: Onyx.METHOD.MERGE, key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`, value: { - avatar: allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`]?.avatar, + avatarURL: allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`]?.avatarURL, }, }, ]; @@ -1549,12 +1549,12 @@ function deleteWorkspaceAvatar(policyID: string) { key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`, value: { pendingFields: { - avatar: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, + avatarURL: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, }, errorFields: { - avatar: null, + avatarURL: null, }, - avatar: '', + avatarURL: '', }, }, ]; @@ -1564,7 +1564,7 @@ function deleteWorkspaceAvatar(policyID: string) { key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`, value: { pendingFields: { - avatar: null, + avatarURL: null, }, }, }, @@ -1575,7 +1575,7 @@ function deleteWorkspaceAvatar(policyID: string) { key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`, value: { errorFields: { - avatar: ErrorUtils.getMicroSecondOnyxError('avatarWithImagePicker.deleteWorkspaceError'), + avatarURL: ErrorUtils.getMicroSecondOnyxError('avatarWithImagePicker.deleteWorkspaceError'), }, }, }, @@ -1592,10 +1592,10 @@ function deleteWorkspaceAvatar(policyID: string) { function clearAvatarErrors(policyID: string) { Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, { errorFields: { - avatar: null, + avatarURL: null, }, pendingFields: { - avatar: null, + avatarURL: null, }, }); } From 954b2df4116553627130d9884ac40f440cb11590 Mon Sep 17 00:00:00 2001 From: Alex Beaman Date: Mon, 29 Apr 2024 12:45:25 +0300 Subject: [PATCH 7/9] Update few remaining keys --- .../sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx | 4 ++-- tests/utils/LHNTestUtils.tsx | 2 +- tests/utils/collections/policies.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx index 1ee6ca9864e9..ecd18fc5b265 100644 --- a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx +++ b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx @@ -43,7 +43,7 @@ const useIsFocused = () => { return isFocused || (topmostCentralPane?.name === SCREENS.SEARCH.CENTRAL_PANE && isSmallScreenWidth); }; -type PolicySelector = Pick; +type PolicySelector = Pick; type FloatingActionButtonAndPopoverOnyxProps = { /** The list of policies the user has access to. */ @@ -89,7 +89,7 @@ const policySelector = (policy: OnyxEntry): PolicySelector => role: policy.role, isPolicyExpenseChatEnabled: policy.isPolicyExpenseChatEnabled, pendingAction: policy.pendingAction, - avatar: policy.avatarURL, + avatarURL: policy.avatarURL, name: policy.name, }) as PolicySelector; diff --git a/tests/utils/LHNTestUtils.tsx b/tests/utils/LHNTestUtils.tsx index e3daa93a3179..abfaf9bd8b00 100644 --- a/tests/utils/LHNTestUtils.tsx +++ b/tests/utils/LHNTestUtils.tsx @@ -248,7 +248,7 @@ function getFakePolicy(id = '1', name = 'Workspace-Test-001'): Policy { type: 'free', owner: 'myuser@gmail.com', outputCurrency: 'BRL', - avatar: '', + avatarURL: '', employeeList: {}, isPolicyExpenseChatEnabled: true, lastModified: '1697323926777105', diff --git a/tests/utils/collections/policies.ts b/tests/utils/collections/policies.ts index 8dd04f4750a9..5507c9e75436 100644 --- a/tests/utils/collections/policies.ts +++ b/tests/utils/collections/policies.ts @@ -20,7 +20,7 @@ export default function createRandomPolicy(index: number): Policy { role: rand(Object.values(CONST.POLICY.ROLE)), owner: randEmail(), ownerAccountID: index, - avatar: randAvatar(), + avatarURL: randAvatar(), isFromFullPolicy: randBoolean(), lastModified: randPastDate().toISOString(), pendingAction: rand(Object.values(CONST.RED_BRICK_ROAD_PENDING_ACTION)), From 18e2f09bdf5a250aabfa4cb40805b34b714d3420 Mon Sep 17 00:00:00 2001 From: Alex Beaman Date: Wed, 1 May 2024 19:08:37 +0300 Subject: [PATCH 8/9] Update policy avatar key to avatarURL --- src/libs/actions/Policy.ts | 2 +- src/pages/workspace/WorkspaceInitialPage.tsx | 2 +- src/pages/workspace/WorkspaceProfilePage.tsx | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libs/actions/Policy.ts b/src/libs/actions/Policy.ts index 52d255ef2770..d3d62f406ac6 100644 --- a/src/libs/actions/Policy.ts +++ b/src/libs/actions/Policy.ts @@ -1502,7 +1502,7 @@ function updateWorkspaceAvatar(policyID: string, file: File) { avatarURL: file.uri, originalFileName: file.name, errorFields: { - avatar: null, + avatarURL: null, }, pendingFields: { avatarURL: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, diff --git a/src/pages/workspace/WorkspaceInitialPage.tsx b/src/pages/workspace/WorkspaceInitialPage.tsx index 94fffca3f0b6..dac2b9008945 100644 --- a/src/pages/workspace/WorkspaceInitialPage.tsx +++ b/src/pages/workspace/WorkspaceInitialPage.tsx @@ -136,7 +136,7 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, reimbursementAcc const hasMembersError = PolicyUtils.hasEmployeeListError(policy); const hasPolicyCategoryError = PolicyUtils.hasPolicyCategoriesError(policyCategories); - const hasGeneralSettingsError = !isEmptyObject(policy?.errorFields?.generalSettings ?? {}) || !isEmptyObject(policy?.errorFields?.avatar ?? {}); + const hasGeneralSettingsError = !isEmptyObject(policy?.errorFields?.generalSettings ?? {}) || !isEmptyObject(policy?.errorFields?.avatarURL ?? {}); const shouldShowProtectedItems = PolicyUtils.isPolicyAdmin(policy); const isPaidGroupPolicy = PolicyUtils.isPaidGroupPolicy(policy); const isFreeGroupPolicy = PolicyUtils.isFreeGroupPolicy(policy); diff --git a/src/pages/workspace/WorkspaceProfilePage.tsx b/src/pages/workspace/WorkspaceProfilePage.tsx index dc4866ef2a32..337681a2c670 100644 --- a/src/pages/workspace/WorkspaceProfilePage.tsx +++ b/src/pages/workspace/WorkspaceProfilePage.tsx @@ -137,7 +137,7 @@ function WorkspaceProfilePage({policy, currencyList = {}, route}: WorkSpaceProfi type={CONST.ICON_TYPE_WORKSPACE} fallbackIcon={Expensicons.FallbackWorkspaceAvatar} style={[ - policy?.errorFields?.avatar ?? isSmallScreenWidth ? styles.mb1 : styles.mb3, + policy?.errorFields?.avatarURL ?? isSmallScreenWidth ? styles.mb1 : styles.mb3, isSmallScreenWidth ? styles.mtn17 : styles.mtn20, styles.alignItemsStart, styles.sectionMenuItemTopDescription, @@ -148,7 +148,7 @@ function WorkspaceProfilePage({policy, currencyList = {}, route}: WorkSpaceProfi onImageRemoved={() => Policy.deleteWorkspaceAvatar(policy?.id ?? '')} editorMaskImage={Expensicons.ImageCropSquareMask} pendingAction={policy?.pendingFields?.avatarURL} - errors={policy?.errorFields?.avatar} + errors={policy?.errorFields?.avatarURL} onErrorClose={() => Policy.clearAvatarErrors(policy?.id ?? '')} previewSource={UserUtils.getFullSizeAvatar(policy?.avatarURL ?? '')} headerTitle={translate('workspace.common.workspaceAvatar')} From abe4e093b97eeb9b37bfd6400e606475d118bf1a Mon Sep 17 00:00:00 2001 From: Alex Beaman Date: Wed, 1 May 2024 19:16:28 +0300 Subject: [PATCH 9/9] Migrate a few more instances to avatarURL --- src/components/MoneyRequestConfirmationList.tsx | 2 +- src/pages/iou/request/step/IOURequestStepSendFrom.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/MoneyRequestConfirmationList.tsx b/src/components/MoneyRequestConfirmationList.tsx index 17ee0d31d63c..dd3e207c45fa 100755 --- a/src/components/MoneyRequestConfirmationList.tsx +++ b/src/components/MoneyRequestConfirmationList.tsx @@ -1043,7 +1043,7 @@ function MoneyRequestConfirmationList({ key={translate('workspace.invoices.sendFrom')} shouldShowRightIcon={!isReadOnly && canUpdateSenderWorkspace} title={senderWorkspace?.name} - icon={senderWorkspace?.avatar ? senderWorkspace?.avatar : getDefaultWorkspaceAvatar(senderWorkspace?.name)} + icon={senderWorkspace?.avatarURL ? senderWorkspace?.avatarURL : getDefaultWorkspaceAvatar(senderWorkspace?.name)} iconType={CONST.ICON_TYPE_WORKSPACE} description={translate('workspace.common.workspace')} label={translate('workspace.invoices.sendFrom')} diff --git a/src/pages/iou/request/step/IOURequestStepSendFrom.tsx b/src/pages/iou/request/step/IOURequestStepSendFrom.tsx index 6de3780aa6e8..a5def1072f7e 100644 --- a/src/pages/iou/request/step/IOURequestStepSendFrom.tsx +++ b/src/pages/iou/request/step/IOURequestStepSendFrom.tsx @@ -47,7 +47,7 @@ function IOURequestStepSendFrom({route, transaction, allPolicies}: IOURequestSte keyForList: policy.id, icons: [ { - source: policy?.avatar ? policy.avatar : ReportUtils.getDefaultWorkspaceAvatar(policy.name), + source: policy?.avatarURL ? policy.avatarURL : ReportUtils.getDefaultWorkspaceAvatar(policy.name), fallbackIcon: Expensicons.FallbackWorkspaceAvatar, name: policy.name, type: CONST.ICON_TYPE_WORKSPACE,