Skip to content

Commit dca0b3a

Browse files
fix: wrong feedback message when inviting external users (RocketChat#37068)
1 parent 23ba66a commit dca0b3a

3 files changed

Lines changed: 12 additions & 6 deletions

File tree

.changeset/late-impalas-battle.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@rocket.chat/i18n': patch
3+
'@rocket.chat/meteor': patch
4+
---
5+
6+
Changes the feedback message when inviting external users to a federated channel

apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.tsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ const AddUsers = ({ rid, onClickBack, reload }: AddUsersProps): ReactElement =>
3636
const dispatchToastMessage = useToastMessageDispatch();
3737
const room = useRoom();
3838
const usersFieldId = useId();
39+
const roomIsFederated = isRoomFederated(room);
40+
// we are dropping the non native federation for now
41+
const isFederationBlocked = room && !isRoomNativeFederated(room);
3942

4043
const { closeTab } = useRoomToolbox();
4144
const saveAction = useMethod('addUsersToRoom');
@@ -50,7 +53,7 @@ const AddUsers = ({ rid, onClickBack, reload }: AddUsersProps): ReactElement =>
5053
const handleSave = useEffectEvent(async ({ users }: { users: string[] }) => {
5154
try {
5255
await saveAction({ rid, users });
53-
dispatchToastMessage({ type: 'success', message: t('Users_added') });
56+
dispatchToastMessage({ type: 'success', message: t(roomIsFederated && !isFederationBlocked ? 'Users_invited' : 'Users_added') });
5457
onClickBack();
5558
reload();
5659
} catch (error) {
@@ -60,10 +63,6 @@ const AddUsers = ({ rid, onClickBack, reload }: AddUsersProps): ReactElement =>
6063

6164
const addClickHandler = useAddMatrixUsers();
6265

63-
const roomIsFederated = isRoomFederated(room);
64-
// we are dropping the non native federation for now
65-
const isFederationBlocked = room && !isRoomNativeFederated(room);
66-
6766
return (
6867
<ContextualbarDialog>
6968
<ContextualbarHeader>

packages/i18n/src/locales/en.i18n.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7059,5 +7059,6 @@
70597059
"You_cannot_add_external_users_to_non_federated_room": "You cannot add external users to a non-federated room",
70607060
"VERIFIED": "User is verified",
70617061
"UNVERIFIED": "User is unverified",
7062-
"UNABLE_TO_VERIFY": "Unable to verify user"
7062+
"UNABLE_TO_VERIFY": "Unable to verify user",
7063+
"Users_invited": "The users have been invited"
70637064
}

0 commit comments

Comments
 (0)