Add policy avatar

Expensify · Feb 5, 2024 · 72dee1d · 72dee1d
1 parent 0ae07be
commit 72dee1d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
@@ -1458,9 +1458,11 @@ function getIconsForParticipants(participants: number[], personalDetails: OnyxCo
  */
 function getWorkspaceIcon(report: OnyxEntry<Report>, policy: OnyxEntry<Policy> = 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);
+    // disabling to protect against empty strings
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    const policyAvatarURL = report?.policyAvatar || allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatar;
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    const policyExpenseChatAvatarSource = policyAvatarURL || getDefaultWorkspaceAvatar(workspaceName);
 
     const workspaceIcon: Icon = {
         source: policyExpenseChatAvatarSource ?? '',
@@ -1553,6 +1555,7 @@ function getIcons(
         return [domainIcon];
     }
     if (isAdminRoom(report) || isAnnounceRoom(report) || isChatRoom(report) || isArchivedRoom(report)) {
+        console.log('run in here');
         const workspaceIcon = getWorkspaceIcon(report, policy);
         return [workspaceIcon];
     }

diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js
@@ -205,6 +205,7 @@ function ReportScreen({
             visibility: reportProp.visibility,
             oldPolicyName: reportProp.oldPolicyName,
             policyName: reportProp.policyName,
+            policyAvatar: reportProp.policyAvatar,
             isOptimisticReport: reportProp.isOptimisticReport,
         }),
         [
@@ -241,6 +242,7 @@ function ReportScreen({
             reportProp.visibility,
             reportProp.oldPolicyName,
             reportProp.policyName,
+            reportProp.policyAvatar,
             reportProp.isOptimisticReport,
         ],
     );

diff --git a/src/types/onyx/Report.ts b/src/types/onyx/Report.ts
@@ -64,6 +64,9 @@ type Report = {
     /** The current user's notification preference for this report */
     notificationPreference?: NotificationPreference;
 
+    /** The policy avatar to use, if any */
+    policyAvatar?: string | null;
+
     /** The policy name to use */
     policyName?: string | null;