Skip to content

fix: User's name is not displayed in mention #72291

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
arosiclair merged 5 commits into from
Oct 22, 2025
Merged

fix: User's name is not displayed in mention #72291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
17c120c
fix: User's name is not displayed in mention
nkdengineer Oct 10, 2025
3b0ebfa
fix prettier
nkdengineer Oct 10, 2025
f54c89a
Merge branch 'main' into fix/70893
nkdengineer Oct 11, 2025
8a14795
Merge branch 'main' into fix/70893
nkdengineer Oct 17, 2025
957664e
fix random email case
nkdengineer Oct 17, 2025
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
14 changes: 10 additions & 4 deletions src/components/HTMLEngineProvider/HTMLRenderers/MentionUserRenderer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ function MentionUserRenderer({style, tnode, TDefaultRenderer, currentUserPersona
if (!isEmpty(htmlAttribAccountID) && personalDetails?.[htmlAttribAccountID]) {
const user = personalDetails[htmlAttribAccountID];
accountID = parseInt(htmlAttribAccountID, 10);
mentionDisplayText = formatPhoneNumber(user?.login ?? '') || getDisplayNameOrDefault(user);
mentionDisplayText = getDisplayNameOrDefault(user) || formatPhoneNumber(user?.login ?? '');
mentionDisplayText = getShortMentionIfFound(mentionDisplayText, htmlAttributeAccountID, currentUserPersonalDetails, user?.login ?? '') ?? '';
navigationRoute = ROUTES.PROFILE.getRoute(accountID, Navigation.getReportRHPActiveRoute());
} else if ('data' in tnode && !isEmptyObject(tnode.data)) {
Expand All @@ -56,9 +56,15 @@ function MentionUserRenderer({style, tnode, TDefaultRenderer, currentUserPersona
Str.removeSMSDomain(getShortMentionIfFound(mentionDisplayText, htmlAttributeAccountID, currentUserPersonalDetails) ?? ''),
);

accountID = getAccountIDsByLogins([mentionDisplayText])?.at(0) ?? -1;
accountID = getAccountIDsByLogins([mentionDisplayText], false)?.at(0) ?? -1;
if (accountID !== -1) {
const user = personalDetails?.[accountID];
mentionDisplayText = getDisplayNameOrDefault(user) || formatPhoneNumber(user?.login ?? '');
mentionDisplayText = getShortMentionIfFound(mentionDisplayText, htmlAttributeAccountID, currentUserPersonalDetails, user?.login ?? '') ?? '';
} else {
mentionDisplayText = Str.removeSMSDomain(mentionDisplayText);
}
navigationRoute = ROUTES.PROFILE.getRoute(accountID, Navigation.getReportRHPActiveRoute(), mentionDisplayText);
mentionDisplayText = Str.removeSMSDomain(mentionDisplayText);
} else {
// If neither an account ID or email is provided, don't render anything
return null;
Expand Down Expand Up @@ -114,7 +120,7 @@ function MentionUserRenderer({style, tnode, TDefaultRenderer, currentUserPersona
testID="mention-user"
href={`/${navigationRoute}`}
>
{htmlAttribAccountID ? `@${mentionDisplayText}` : <TNodeChildrenRenderer tnode={tnodeClone ?? tnode} />}
{accountID && accountID !== -1 ? `@${mentionDisplayText}` : <TNodeChildrenRenderer tnode={tnodeClone ?? tnode} />}
</Text>
</UserDetailsTooltip>
</Text>
Expand Down
4 changes: 2 additions & 2 deletions src/libs/PersonalDetailsUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,12 +147,12 @@ function getPersonalDetailByEmail(email: string): PersonalDetails | undefined {
* @param logins Array of user logins
* @returns Array of accountIDs according to passed logins
*/
function getAccountIDsByLogins(logins: string[]): number[] {
function getAccountIDsByLogins(logins: string[], shouldGenerateAccountID = true): number[] {
return logins.reduce<number[]>((foundAccountIDs, login) => {
const currentDetail = personalDetails.find((detail) => detail?.login === login?.toLowerCase());
if (!currentDetail) {
// generate an account ID because in this case the detail is probably new, so we don't have a real accountID yet
foundAccountIDs.push(generateAccountID(login));
foundAccountIDs.push(shouldGenerateAccountID ? generateAccountID(login) : -1);
} else {
foundAccountIDs.push(Number(currentDetail.accountID));
}
Expand Down
Loading