fix(searchtooltip): Support login to accountid migration PR21026

Expensify · Jun 28, 2023 · 619394d · 619394d
1 parent cdfc707
commit 619394d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/components/MultipleAvatars.js b/src/components/MultipleAvatars.js
@@ -80,7 +80,7 @@ function MultipleAvatars(props) {
             <UserDetailsTooltip
                 accountID={props.icons[0].id}
                 fallbackUserDetails={{
-                    displayName: ReportUtils.getDisplayNameForParticipant(props.icons[0].name),
+                    displayName: ReportUtils.getDisplayNameForParticipant(props.icons[0].id),
                     login: lodashGet(props.icons[0], 'name', tooltipTexts[0]),
                     avatar: lodashGet(props.icons[0], 'source', ''),
                 }}

diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js
@@ -516,7 +516,7 @@ function createOption(accountIDs, personalDetails, report, reportActions = {}, {
 
     result.text = reportName;
     result.searchText = getSearchText(report, reportName, personalDetailList, result.isChatRoom || result.isPolicyExpenseChat, result.isThread);
-    result.icons = ReportUtils.getIcons(report, personalDetails, UserUtils.getAvatar(personalDetail.avatar, personalDetail.accountID), false, personalDetail.login);
+    result.icons = ReportUtils.getIcons(report, personalDetails, UserUtils.getAvatar(personalDetail.avatar, personalDetail.accountID), false, personalDetail.login, personalDetail.accountID);
     result.subtitle = subtitle;
 
     return result;

diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
@@ -712,9 +712,10 @@ function getIconsForParticipants(participants, personalDetails) {
  * @param {*} [defaultIcon]
  * @param {Boolean} [isPayer]
  * @param {String} [defaultName]
+ * @param {Number} [defaultID]
  * @returns {Array<*>}
  */
-function getIcons(report, personalDetails, defaultIcon = null, isPayer = false, defaultName = '') {
+function getIcons(report, personalDetails, defaultIcon = null, isPayer = false, defaultName = '', defaultID = undefined) {
     const result = {
         source: '',
         type: CONST.ICON_TYPE_AVATAR,
@@ -724,6 +725,7 @@ function getIcons(report, personalDetails, defaultIcon = null, isPayer = false,
     if (_.isEmpty(report)) {
         result.source = defaultIcon || Expensicons.FallbackAvatar;
         result.name = defaultName || '';
+        result.id = defaultID;
         return [result];
     }
     if (isArchivedRoom(report)) {