diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js index 3a602eef27d2..6b0312c0499e 100644 --- a/src/libs/OptionsListUtils.js +++ b/src/libs/OptionsListUtils.js @@ -758,16 +758,27 @@ function getOptions( !_.find(loginOptionsToExclude, (loginOptionToExclude) => loginOptionToExclude.login === addSMSDomainIfPhoneNumber(searchValue).toLowerCase()) && (searchValue !== CONST.EMAIL.CHRONOS || Permissions.canUseChronos(betas)) ) { - const fakeAccountID = UserUtils.generateAccountID(); - userToInvite = createOption([fakeAccountID], personalDetails, null, reportActions, { + // Generates an optimistic account ID for new users not yet saved in Onyx + const optimisticAccountID = UserUtils.generateAccountID(); + const personalDetailsExtended = { + ...personalDetails, + [optimisticAccountID]: { + accountID: optimisticAccountID, + login: searchValue, + avatar: UserUtils.getDefaultAvatar(optimisticAccountID), + }, + }; + userToInvite = createOption([optimisticAccountID], personalDetailsExtended, null, reportActions, { showChatPreviewLine, }); userToInvite.login = searchValue; + userToInvite.text = userToInvite.text || searchValue; + userToInvite.alternateText = userToInvite.alternateText || searchValue; // If user doesn't exist, use a default avatar userToInvite.icons = [ { - source: UserUtils.getAvatar('', fakeAccountID), + source: UserUtils.getAvatar('', optimisticAccountID), login: searchValue, type: CONST.ICON_TYPE_AVATAR, }, diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js index 181df5ec442c..979f9f28b839 100644 --- a/src/libs/ReportUtils.js +++ b/src/libs/ReportUtils.js @@ -887,7 +887,7 @@ function getDisplayNameForParticipant(accountID, shouldUseShortForm = false) { function getDisplayNamesWithTooltips(participants, isMultipleParticipantReport) { return _.map(participants, (participant) => { const personalDetails = getPersonalDetailsForAccountID(participant.accountID); - const displayName = getDisplayNameForParticipant(participant.accountID, isMultipleParticipantReport); + const displayName = getDisplayNameForParticipant(participant.accountID, isMultipleParticipantReport) || participant.login; const tooltip = personalDetails.login ? Str.removeSMSDomain(personalDetails.login) : '';