Skip to content

fix: leave warning modal translation interpolation #35522

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

Closed
aryanranderiya wants to merge 3 commits into from
Closed

fix: leave warning modal translation interpolation #35522

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
8de88b4
fix: correct translation placeholder usage in leave room action
aryanranderiya Mar 15, 2025
49807a1
Merge branch 'develop' into fix/translation-placeholder-issue
aryanranderiya Mar 16, 2025
005a87e
Merge branch 'develop' into fix/translation-placeholder-issue
aryanranderiya Mar 19, 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
12 changes: 6 additions & 6 deletions apps/meteor/client/hooks/menuActions/useLeaveRoom.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import type { RoomType } from '@rocket.chat/core-typings';
import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
import type { TranslationKey } from '@rocket.chat/ui-contexts';
import { useEndpoint, useRouter, useSetModal, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
import { useTranslation } from 'react-i18next';

import { LegacyRoomManager } from '../../../app/ui-utils/client';
import { useEndpoint, useRouter, useSetModal, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
import { UiTextContext } from '../../../definition/IRoomTypeConfig';
import WarningModal from '../../components/WarningModal';
import { roomCoordinator } from '../../lib/rooms/roomCoordinator';
import { LegacyRoomManager } from '/app/ui-utils/client';

const leaveEndpoints = {
p: '/v1/groups.leave',
Expand All @@ -26,14 +24,17 @@ type LeaveRoomProps = {

// TODO: this menu action should consider team leaving
export const useLeaveRoomAction = ({ rid, type, name, roomOpen }: LeaveRoomProps) => {
const { t } = useTranslation();
const t = useTranslation();
const setModal = useSetModal();
const dispatchToastMessage = useToastMessageDispatch();
const router = useRouter();

const leaveRoom = useEndpoint('POST', leaveEndpoints[type]);

const handleLeave = useEffectEvent(() => {

const warnText = roomCoordinator.getRoomDirectives(type).getUiText(UiTextContext.LEAVE_WARNING);

const leave = async (): Promise<void> => {
try {
await leaveRoom({ roomId: rid });
Expand All @@ -48,7 +49,6 @@ export const useLeaveRoomAction = ({ rid, type, name, roomOpen }: LeaveRoomProps
}
};

const warnText = roomCoordinator.getRoomDirectives(type).getUiText(UiTextContext.LEAVE_WARNING);

setModal(
<WarningModal
Expand Down
3 changes: 2 additions & 1 deletion apps/meteor/client/views/room/contextualBar/Info/hooks/actions/useRoomLeave.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,11 @@ export const useRoomLeave = (room: IRoom, joined = true) => {
};

const warnText = roomCoordinator.getRoomDirectives(room.t).getUiText(UiTextContext.LEAVE_WARNING);
const roomName = room.fname || room.name;

setModal(
<WarningModal
text={t(warnText as TranslationKey, room.fname || room.name)}
text={t(warnText as TranslationKey, roomName)}
confirmText={t('Leave_room')}
close={() => setModal(null)}
cancelText={t('Cancel')}
Expand Down