From 2e986c27344ce1f268bb351d083951402ba4f7de Mon Sep 17 00:00:00 2001 From: Antony Kithinzi Date: Mon, 12 Feb 2024 04:55:46 +0100 Subject: [PATCH 1/4] fix: Fixing the getWorkspaceIcon function to return ther default workspace avatar for default rooms --- src/libs/ReportUtils.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index 26280f95447d..74050f95a555 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -1452,9 +1452,11 @@ 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 - : getDefaultWorkspaceAvatar(workspaceName); + const rootParentReport = getRootParentReport(report); + const policyExpenseChatAvatarSource = + (isEmptyObject(rootParentReport) || !isDefaultRoom(rootParentReport)) && allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatar + ? allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatar + : getDefaultWorkspaceAvatar(workspaceName); const workspaceIcon: Icon = { source: policyExpenseChatAvatarSource ?? '', From 860043fd155e489b47d66d5bb9b8a119ff6eadf3 Mon Sep 17 00:00:00 2001 From: Antony Kithinzi Date: Fri, 16 Feb 2024 23:26:08 +0100 Subject: [PATCH 2/4] Applying suggestion Co-authored-by: Akinwale Ariwodola --- src/libs/ReportUtils.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index 88b75f0e0af3..afbd003841e7 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -1453,7 +1453,10 @@ function getIconsForParticipants(participants: number[], personalDetails: OnyxCo function getWorkspaceIcon(report: OnyxEntry, policy: OnyxEntry = null): Icon { const workspaceName = getPolicyName(report, false, policy); const rootParentReport = getRootParentReport(report); - const policyExpenseChatAvatarSource = + const hasCustomAvatar = (isEmptyObject(rootParentReport) || !isDefaultRoom(rootParentReport)) && allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatar; + const policyExpenseChatAvatarSource = hasCustomAvatar ? + allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatar : + getDefaultWorkspaceAvatar(workspaceName); (isEmptyObject(rootParentReport) || !isDefaultRoom(rootParentReport)) && allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatar ? allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatar : getDefaultWorkspaceAvatar(workspaceName); From 1c1a7c7566988a71c8897e67fdf87325313aa236 Mon Sep 17 00:00:00 2001 From: Antony Kithinzi Date: Sun, 18 Feb 2024 04:28:41 +0100 Subject: [PATCH 3/4] lint --- src/libs/ReportUtils.ts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index afbd003841e7..6d47e3b25ecd 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -1454,12 +1454,7 @@ function getWorkspaceIcon(report: OnyxEntry, policy: OnyxEntry = const workspaceName = getPolicyName(report, false, policy); const rootParentReport = getRootParentReport(report); const hasCustomAvatar = (isEmptyObject(rootParentReport) || !isDefaultRoom(rootParentReport)) && allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatar; - const policyExpenseChatAvatarSource = hasCustomAvatar ? - allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatar : - getDefaultWorkspaceAvatar(workspaceName); - (isEmptyObject(rootParentReport) || !isDefaultRoom(rootParentReport)) && allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatar - ? allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatar - : getDefaultWorkspaceAvatar(workspaceName); + const policyExpenseChatAvatarSource = hasCustomAvatar ? allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatar : getDefaultWorkspaceAvatar(workspaceName); const workspaceIcon: Icon = { source: policyExpenseChatAvatarSource ?? '', From e971eb4651e0adf722d3ff96b6c7d44c2139e244 Mon Sep 17 00:00:00 2001 From: Antony Kithinzi Date: Sun, 18 Feb 2024 22:14:22 +0100 Subject: [PATCH 4/4] custom avatar negation for chat and archived room --- src/libs/ReportUtils.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index 9a0090e84aa9..1401a10fa096 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -1476,7 +1476,9 @@ function getIconsForParticipants(participants: number[], personalDetails: OnyxCo function getWorkspaceIcon(report: OnyxEntry, policy: OnyxEntry = null): Icon { const workspaceName = getPolicyName(report, false, policy); const rootParentReport = getRootParentReport(report); - const hasCustomAvatar = (isEmptyObject(rootParentReport) || !isDefaultRoom(rootParentReport)) && allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatar; + const hasCustomAvatar = + !(isEmptyObject(rootParentReport) || isDefaultRoom(rootParentReport) || isChatRoom(rootParentReport) || isArchivedRoom(rootParentReport)) && + allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatar; const policyExpenseChatAvatarSource = hasCustomAvatar ? allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatar : getDefaultWorkspaceAvatar(workspaceName); const workspaceIcon: Icon = {