Skip to content
Merged
Changes from all commits
Commits
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
24 changes: 4 additions & 20 deletions src/libs/PersonalDetailsUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,31 +36,15 @@ Onyx.connect({
},
});

let hiddenTranslation = '';
let youTranslation = '';

Onyx.connect({
key: ONYXKEYS.ARE_TRANSLATIONS_LOADING,
initWithStoredValues: false,
callback: (value) => {
if (value ?? true) {
return;
}
// eslint-disable-next-line @typescript-eslint/no-deprecated
hiddenTranslation = translateLocal('common.hidden');
// eslint-disable-next-line @typescript-eslint/no-deprecated
youTranslation = translateLocal('common.you').toLowerCase();
},
});

const regexMergedAccount = new RegExp(CONST.REGEX.MERGED_ACCOUNT_PREFIX);

function getDisplayNameOrDefault(
passedPersonalDetails?: Partial<PersonalDetails> | null,
defaultValue = '',
shouldFallbackToHidden = true,
shouldAddCurrentUserPostfix = false,
youAfterTranslation = youTranslation,
// eslint-disable-next-line @typescript-eslint/no-deprecated
youAfterTranslation = translateLocal('common.you').toLowerCase(),
): string {
let displayName = passedPersonalDetails?.displayName ?? '';

Expand Down Expand Up @@ -100,8 +84,8 @@ function getDisplayNameOrDefault(
if (login) {
return login;
}

return shouldFallbackToHidden ? hiddenTranslation : '';
// eslint-disable-next-line @typescript-eslint/no-deprecated
return shouldFallbackToHidden ? translateLocal('common.hidden') : '';
}

/**
Expand Down
Loading