Skip to content

[Personal Details List migration]fix: show search value when searching for new account #20576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Beamanator merged 3 commits into from
Jun 12, 2023
Merged

[Personal Details List migration]fix: show search value when searching for new account #20576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b61ad3
fix: fix empty search option when searching for new users
BeeMargarida Jun 12, 2023
4d58410
style: prettier + lint
BeeMargarida Jun 12, 2023
d8f0eb9
fix: comment
BeeMargarida Jun 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions src/libs/OptionsListUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
Expand Down
2 changes: 1 addition & 1 deletion src/libs/ReportUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) : '';

Expand Down