Merge pull request #31659 from Expensify/puneet-displayname-group

Set displayName fallback for group chat members page (cherry picked from commit 981173c)
Expensify · Nov 21, 2023 · c220949 · c220949
1 parent c4ffa24
commit c220949
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/pages/ReportParticipantsPage.js b/src/pages/ReportParticipantsPage.js
@@ -12,6 +12,7 @@ import withLocalize, {withLocalizePropTypes} from '@components/withLocalize';
 import compose from '@libs/compose';
 import * as LocalePhoneNumber from '@libs/LocalePhoneNumber';
 import Navigation from '@libs/Navigation/Navigation';
+import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import * as UserUtils from '@libs/UserUtils';
 import useThemeStyles from '@styles/useThemeStyles';
@@ -59,10 +60,11 @@ const getAllParticipants = (report, personalDetails, translate) =>
         .map((accountID, index) => {
             const userPersonalDetail = lodashGet(personalDetails, accountID, {displayName: personalDetails.displayName || translate('common.hidden'), avatar: ''});
             const userLogin = LocalePhoneNumber.formatPhoneNumber(userPersonalDetail.login || '') || translate('common.hidden');
+            const displayName = PersonalDetailsUtils.getDisplayNameOrDefault(userPersonalDetail, 'displayName');
 
             return {
                 alternateText: userLogin,
-                displayName: userPersonalDetail.displayName,
+                displayName,
                 accountID: userPersonalDetail.accountID,
                 icons: [
                     {
@@ -74,9 +76,9 @@ const getAllParticipants = (report, personalDetails, translate) =>
                 ],
                 keyForList: `${index}-${userLogin}`,
                 login: userLogin,
-                text: userPersonalDetail.displayName,
+                text: displayName,
                 tooltipText: userLogin,
-                participantsList: [{accountID, displayName: userPersonalDetail.displayName}],
+                participantsList: [{accountID, displayName}],
             };
         })
         .sortBy((participant) => participant.displayName.toLowerCase())