Skip to content

feat: standardize username display #38532

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

Open
juliajforesti wants to merge 7 commits into
base: develop
Choose a base branch
from
+17 −7
Open

feat: standardize username display #38532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b6fd9a3
feat: display `@` before username
juliajforesti Feb 6, 2026
e884aef
chore: changeset
juliajforesti Feb 6, 2026
7d2a1d0
test: adjust locator
juliajforesti Feb 9, 2026
115409d
feat: consider `UI_Use_Real_Name` in `ComposerBoxPopupUser`
juliajforesti Feb 9, 2026
4ffae4d
feat: improve nickname display in `ComposerBoxPopupUser`
juliajforesti Feb 9, 2026
aab1cf6
Merge branch 'develop' into feat/option-username-display
kodiakhq[bot] Feb 10, 2026
31eed91
Merge branch 'develop' into feat/option-username-display
kodiakhq[bot] Feb 11, 2026
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
5 changes: 5 additions & 0 deletions .changeset/wet-beers-end.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': minor
---

Standardizes the display of username with `@` before
2 changes: 1 addition & 1 deletion apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultipleOption.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const UserAutoCompleteMultipleOption = ({ label, ...props }: UserAutoCompleteMul

return (
<>
{name} {!_federated && <OptionDescription>({username})</OptionDescription>}
{name} {!_federated && <OptionDescription>@{username}</OptionDescription>}
</>
);
}, [_federated, name, useRealName, username]);
Expand Down
11 changes: 8 additions & 3 deletions apps/meteor/client/views/room/composer/ComposerBoxPopupUser.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 = {
Expand All @@ -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 (
<>
Expand All @@ -31,15 +36,15 @@ function ComposerBoxPopupUser({ _id, system, username, name, nickname, outside,
<ReactiveUserStatus uid={_id} />
</OptionColumn>
<OptionContent>
<strong>{name ?? username}</strong> {name && name !== username && username}
{nickname && <span className='popup-user-nickname'>({nickname})</span>}
<strong>{nameOrUsername}</strong> {displayUsername && `@${displayUsername}`}
{nickname && <span className='popup-user-nickname'> ({nickname})</span>}
</OptionContent>
</>
)}

{system && (
<OptionContent>
<strong>{username}</strong> {name}
<strong>@{username}</strong> {name}
</OptionContent>
)}

Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ const RoomMembersItem = ({
</OptionAvatar>
<OptionColumn>{federated ? <Icon name='globe' size='x16' /> : <ReactiveUserStatus uid={_id} />}</OptionColumn>
<OptionContent data-qa={`MemberItem-${username}`}>
{nameOrUsername} {displayUsername && <OptionDescription>({displayUsername})</OptionDescription>}
{nameOrUsername} {displayUsername && <OptionDescription>@{displayUsername}</OptionDescription>}
</OptionContent>
{subscription?.status === 'INVITED' && (
<OptionColumn>
Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/tests/e2e/message-mentions.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down
Loading