Merge pull request #21895 from Expensify/cristi_refactor-duplicated-code

Reuse logic for policy name and workspace avatar
Expensify · Jun 30, 2023 · 282ee2c · 282ee2c
2 parents 3404111 + f3c9e23
commit 282ee2c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
@@ -776,9 +776,9 @@ function getIcons(report, personalDetails, defaultIcon = null, isPayer = false,
         return [result];
     }
     if (isPolicyExpenseChat(report) || isExpenseReport(report)) {
-        const workspaceName = lodashGet(allPolicies, [`${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`, 'name']);
+        const workspaceName = getPolicyName(report);
 
-        const policyExpenseChatAvatarSource = lodashGet(allPolicies, [`${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`, 'avatar']) || getDefaultWorkspaceAvatar(workspaceName);
+        const policyExpenseChatAvatarSource = getWorkspaceAvatar(report);
 
         // Return the workspace avatar if the user is the owner of the policy expense chat
         if (report.isOwnPolicyExpenseChat && !isExpenseReport(report)) {