Skip to content
Draft
Show file tree
Hide file tree
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
5 changes: 5 additions & 0 deletions .changeset/wet-beers-end.md
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,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>{name ?? `@${username}`}</strong> {name && name !== username && `@${username}`}
{nickname && <span className='popup-user-nickname'>@{nickname}</span>}
</OptionContent>
</>
)}

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

Expand Down
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
Loading