Skip to content

fix(federation): missing icon tooltip on add users modal #37065

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
ggazzo merged 3 commits into from
Sep 25, 2025
Merged

fix(federation): missing icon tooltip on add users modal #37065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cae8cd5
fix: add icon tooltip and improve type definitions in AddMatrixUsersM…
juliajforesti Sep 25, 2025
fafadbb
chore: add translations
juliajforesti Sep 25, 2025
69b7a8b
chore: changeset
juliajforesti Sep 25, 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
6 changes: 6 additions & 0 deletions .changeset/neat-spoons-worry.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@rocket.chat/i18n': patch
'@rocket.chat/meteor': patch
---

Adds missing tooltip when adding users to federated room, indicating verification status
31 changes: 14 additions & 17 deletions ...ient/views/room/contextualBar/RoomMembers/AddUsers/AddMatrixUsers/AddMatrixUsersModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,15 @@ type FormValues = {
usersToInvite: string[];
};

const verificationStatusAsIcon = (verificationStatus: string) => {
const verificationStatusAsIcon = (verificationStatus: string): ComponentProps<typeof Icon>['name'] => {
if (verificationStatus === 'VERIFIED') {
return 'circle-check';
}

if (verificationStatus === 'UNVERIFIED') {
return 'circle-cross';
}

if (verificationStatus === 'UNABLE_TO_VERIFY') {
return 'circle-exclamation';
}
return 'circle-exclamation';
};

const AddMatrixUsersModal = ({ onClose, matrixIdVerifiedStatus, onSave, completeUserList }: AddMatrixUsersModalProps): ReactElement => {
Expand Down Expand Up @@ -71,20 +68,20 @@ const AddMatrixUsersModal = ({ onClose, matrixIdVerifiedStatus, onSave, complete
<ModalClose title={t('Close')} onClick={onClose} />
</ModalHeader>
<ModalContent>
<Box>
<Box is='ul'>
{[...matrixIdVerifiedStatus.entries()].map(([_matrixId, _verificationStatus]) => (
<li key={_matrixId}>
{_matrixId}: <Icon name={verificationStatusAsIcon(_verificationStatus) as ComponentProps<typeof Icon>['name']} size='x20' />
</li>
))}
{rocketChatUsers.map((_user) => (
<li key={`rocket-chat-${_user}`}>{_user}</li>
))}
</Box>
<Box is='ul'>
{[...matrixIdVerifiedStatus.entries()].map(([_matrixId, _verificationStatus]) => (
<Box is='li' display='flex' key={_matrixId}>
{_matrixId} <Icon mis={4} name={verificationStatusAsIcon(_verificationStatus)} title={t(_verificationStatus)} size='x20' />
</Box>
))}
{rocketChatUsers.map((_user) => (
<Box is='li' key={`rocket-chat-${_user}`}>
{_user}
</Box>
))}
</Box>
</ModalContent>
<ModalFooter justifyContent='center'>
<ModalFooter>
<ModalFooterControllers>
<Button onClick={onClose}>{t('Cancel')}</Button>
<Button primary onClick={handleSubmit(onSubmit)} disabled={!(usersToInvite.length > 0)}>
Expand Down
5 changes: 4 additions & 1 deletion packages/i18n/src/locales/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7035,5 +7035,8 @@
"__usernames__joined": "{{usernames}} joined",
"__usersCount__joined": "{{count}} joined",
"__usersCount__people_will_be_invited": "{{usersCount}} people will be invited",
"You_cannot_add_external_users_to_non_federated_room": "You cannot add external users to a non-federated room"
"You_cannot_add_external_users_to_non_federated_room": "You cannot add external users to a non-federated room",
"VERIFIED": "User is verified",
"UNVERIFIED": "User is unverified",
"UNABLE_TO_VERIFY": "Unable to verify user"
}
Loading