get the correct report icons when user is admin

Expensify · Feb 23, 2022 · 7195cd2 · 7195cd2
1 parent 0dab98c
commit 7195cd2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js
@@ -787,13 +787,6 @@ function getReportIcons(report, personalDetails) {
         return [''];
     }
 
-    const sortedParticipants = _.map(report.participants, dmParticipant => ({
-        firstName: lodashGet(personalDetails, [dmParticipant, 'firstName'], ''),
-        avatar: lodashGet(personalDetails, [dmParticipant, 'avatarThumbnail'], '')
-            || getDefaultAvatar(dmParticipant),
-    }))
-        .sort((first, second) => first.firstName - second.firstName);
-
     if (ReportUtils.isPolicyExpenseChat(report)) {
         const policyExpenseChatAvatarURL = lodashGet(policies, [
             `${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`, 'avatarURL',
@@ -804,10 +797,17 @@ function getReportIcons(report, personalDetails) {
             return [policyExpenseChatAvatarURL];
         }
 
-        // If the user is an admin, return avatar url of the other participant of the report (this is their workspace chat) and the avatar url of the workspace
-        return [_.first(sortedParticipants).avatar, policyExpenseChatAvatarURL];
+        // If the user is an admin, return avatar url of the other participant of the report
+        // (their workspace chat) and the avatar url of the workspace
+        return [lodashGet(personalDetails, [report.ownerEmail, 'avatarThumbnail']), policyExpenseChatAvatarURL];
     }
 
+    const sortedParticipants = _.map(report.participants, dmParticipant => ({
+        firstName: lodashGet(personalDetails, [dmParticipant, 'firstName'], ''),
+        avatar: lodashGet(personalDetails, [dmParticipant, 'avatarThumbnail'], '')
+            || getDefaultAvatar(dmParticipant),
+    }))
+        .sort((first, second) => first.firstName - second.firstName);
     return _.map(sortedParticipants, item => item.avatar);
 }
 

diff --git a/src/libs/actions/PersonalDetails.js b/src/libs/actions/PersonalDetails.js
@@ -185,7 +185,7 @@ function getFromReportParticipants(reports) {
             // skip over default rooms which aren't named by participants.
             const reportsToUpdate = {};
             _.each(reports, (report) => {
-                if (report.participants.length <= 0 && !ReportUtils.isChatRoom(report)) {
+                if (report.participants.length <= 0 && !ReportUtils.isChatRoom(report) && !ReportUtils.isPolicyExpenseChat(report)) {
                     return;
                 }