Skip to content

fix: some member appear as Hidden #53540

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
thienlnam merged 2 commits into from
Dec 23, 2024
Merged

fix: some member appear as Hidden #53540

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a8d430
fix: some member appear as Hidden
daledah Dec 4, 2024
5950c11
refactor: change logics to more precise
daledah Dec 6, 2024
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
20 changes: 17 additions & 3 deletions src/libs/PersonalDetailsUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ const regexMergedAccount = new RegExp(CONST.REGEX.MERGED_ACCOUNT_PREFIX);
function getDisplayNameOrDefault(passedPersonalDetails?: Partial<PersonalDetails> | null, defaultValue = '', shouldFallbackToHidden = true, shouldAddCurrentUserPostfix = false): string {
let displayName = passedPersonalDetails?.displayName ?? '';

let login = passedPersonalDetails?.login ?? '';

// If the displayName starts with the merged account prefix, remove it.
if (regexMergedAccount.test(displayName)) {
// Remove the merged account prefix from the displayName.
Expand All @@ -60,8 +62,11 @@ function getDisplayNameOrDefault(passedPersonalDetails?: Partial<PersonalDetails

// If the displayName is not set by the user, the backend sets the diplayName same as the login so
// we need to remove the sms domain from the displayName if it is an sms login.
if (displayName === passedPersonalDetails?.login && Str.isSMSLogin(passedPersonalDetails?.login)) {
displayName = Str.removeSMSDomain(displayName);
if (Str.isSMSLogin(login)) {
if (displayName === login) {
displayName = Str.removeSMSDomain(displayName);
}
login = Str.removeSMSDomain(login);
}

if (shouldAddCurrentUserPostfix && !!displayName) {
Expand All @@ -75,7 +80,16 @@ function getDisplayNameOrDefault(passedPersonalDetails?: Partial<PersonalDetails
if (displayName) {
return displayName;
}
return defaultValue || (shouldFallbackToHidden ? hiddenTranslation : '');

if (defaultValue) {
return defaultValue;
}

if (login) {
return login;
}

return shouldFallbackToHidden ? hiddenTranslation : '';
}

/**
Expand Down