From b6fd9a3112b52de6df2770d01ba09dd51ce14260 Mon Sep 17 00:00:00 2001 From: juliajforesti Date: Fri, 6 Feb 2026 19:27:38 -0300 Subject: [PATCH 1/5] feat: display `@` before username --- .../UserAutoCompleteMultipleOption.tsx | 2 +- .../client/views/room/composer/ComposerBoxPopupUser.tsx | 6 +++--- .../room/contextualBar/RoomMembers/RoomMembersItem.tsx | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultipleOption.tsx b/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultipleOption.tsx index 709c2b5df0181..9a82c5eba53d5 100644 --- a/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultipleOption.tsx +++ b/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultipleOption.tsx @@ -24,7 +24,7 @@ const UserAutoCompleteMultipleOption = ({ label, ...props }: UserAutoCompleteMul return ( <> - {name} {!_federated && ({username})} + {name} {!_federated && @{username}} ); }, [_federated, name, useRealName, username]); diff --git a/apps/meteor/client/views/room/composer/ComposerBoxPopupUser.tsx b/apps/meteor/client/views/room/composer/ComposerBoxPopupUser.tsx index d01c4e07c120c..0153c9d805675 100644 --- a/apps/meteor/client/views/room/composer/ComposerBoxPopupUser.tsx +++ b/apps/meteor/client/views/room/composer/ComposerBoxPopupUser.tsx @@ -31,15 +31,15 @@ function ComposerBoxPopupUser({ _id, system, username, name, nickname, outside, - {name ?? username} {name && name !== username && username} - {nickname && ({nickname})} + {name ?? `@${username}`} {name && name !== username && `@${username}`} + {nickname && @{nickname}} )} {system && ( - {username} {name} + @{username} {name} )} diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersItem.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersItem.tsx index 26e09d4ef4621..ef1448d50ff64 100644 --- a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersItem.tsx +++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersItem.tsx @@ -67,7 +67,7 @@ const RoomMembersItem = ({ {federated ? : } - {nameOrUsername} {displayUsername && ({displayUsername})} + {nameOrUsername} {displayUsername && @{displayUsername}} {subscription?.status === 'INVITED' && ( From e884aefa2cf034e3bc5f663d4e32e7019ad0a902 Mon Sep 17 00:00:00 2001 From: juliajforesti Date: Fri, 6 Feb 2026 19:28:38 -0300 Subject: [PATCH 2/5] chore: changeset --- .changeset/wet-beers-end.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/wet-beers-end.md diff --git a/.changeset/wet-beers-end.md b/.changeset/wet-beers-end.md new file mode 100644 index 0000000000000..b63ca6038c1fa --- /dev/null +++ b/.changeset/wet-beers-end.md @@ -0,0 +1,5 @@ +--- +'@rocket.chat/meteor': minor +--- + +Standardizes the display of username with `@` before From 7d2a1d0fbf3e1ffdcc649991f3db5c714816f869 Mon Sep 17 00:00:00 2001 From: juliajforesti Date: Mon, 9 Feb 2026 10:18:17 -0300 Subject: [PATCH 3/5] test: adjust locator --- apps/meteor/tests/e2e/message-mentions.spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/meteor/tests/e2e/message-mentions.spec.ts b/apps/meteor/tests/e2e/message-mentions.spec.ts index 87ca04206bad3..d03c62edd4f5b 100644 --- a/apps/meteor/tests/e2e/message-mentions.spec.ts +++ b/apps/meteor/tests/e2e/message-mentions.spec.ts @@ -111,8 +111,8 @@ test.describe.serial('message-mentions', () => { await poHomeChannel.navbar.openChat('general'); await poHomeChannel.composer.inputMessage.type('@'); - await expect(poHomeChannel.content.messagePopupUsers.locator('role=listitem >> text="all"')).toBeVisible(); - await expect(poHomeChannel.content.messagePopupUsers.locator('role=listitem >> text="here"')).toBeVisible(); + await expect(poHomeChannel.content.messagePopupUsers.locator('role=listitem >> text="@all"')).toBeVisible(); + await expect(poHomeChannel.content.messagePopupUsers.locator('role=listitem >> text="@here"')).toBeVisible(); }); test.describe('users not in channel', () => { From 115409d671297cf089e544ccfd9a9990fc1db9b0 Mon Sep 17 00:00:00 2001 From: juliajforesti Date: Mon, 9 Feb 2026 15:34:02 -0300 Subject: [PATCH 4/5] feat: consider `UI_Use_Real_Name` in `ComposerBoxPopupUser` --- .../client/views/room/composer/ComposerBoxPopupUser.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/meteor/client/views/room/composer/ComposerBoxPopupUser.tsx b/apps/meteor/client/views/room/composer/ComposerBoxPopupUser.tsx index 0153c9d805675..27dd25208fa03 100644 --- a/apps/meteor/client/views/room/composer/ComposerBoxPopupUser.tsx +++ b/apps/meteor/client/views/room/composer/ComposerBoxPopupUser.tsx @@ -1,7 +1,9 @@ import { OptionAvatar, OptionColumn, OptionContent, OptionInput } from '@rocket.chat/fuselage'; import { UserAvatar } from '@rocket.chat/ui-avatar'; +import { useSetting } from '@rocket.chat/ui-contexts'; import { useTranslation } from 'react-i18next'; +import { getUserDisplayNames } from '../../../../lib/getUserDisplayNames'; import ReactiveUserStatus from '../../../components/UserStatus/ReactiveUserStatus'; export type ComposerBoxPopupUserProps = { @@ -19,6 +21,9 @@ export type ComposerBoxPopupUserProps = { function ComposerBoxPopupUser({ _id, system, username, name, nickname, outside, suggestion, variant }: ComposerBoxPopupUserProps) { const { t } = useTranslation(); + const useRealName = useSetting('UI_Use_Real_Name', false); + + const [nameOrUsername, displayUsername] = getUserDisplayNames(name, username, useRealName); return ( <> @@ -31,7 +36,7 @@ function ComposerBoxPopupUser({ _id, system, username, name, nickname, outside, - {name ?? `@${username}`} {name && name !== username && `@${username}`} + {nameOrUsername} {displayUsername && `@${displayUsername}`} {nickname && @{nickname}} From 4ffae4de09beb18f1b4a3fa218123ea5f08c12f9 Mon Sep 17 00:00:00 2001 From: juliajforesti Date: Mon, 9 Feb 2026 15:39:42 -0300 Subject: [PATCH 5/5] feat: improve nickname display in `ComposerBoxPopupUser` --- apps/meteor/client/views/room/composer/ComposerBoxPopupUser.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/meteor/client/views/room/composer/ComposerBoxPopupUser.tsx b/apps/meteor/client/views/room/composer/ComposerBoxPopupUser.tsx index 27dd25208fa03..a823b14dd7b26 100644 --- a/apps/meteor/client/views/room/composer/ComposerBoxPopupUser.tsx +++ b/apps/meteor/client/views/room/composer/ComposerBoxPopupUser.tsx @@ -37,7 +37,7 @@ function ComposerBoxPopupUser({ _id, system, username, name, nickname, outside, {nameOrUsername} {displayUsername && `@${displayUsername}`} - {nickname && @{nickname}} + {nickname && ({nickname})} )}