Skip to content
Closed
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
9523bde
Refactor ReturnChatQueueModal to use GenericModal
amankv1234 Jan 28, 2026
6f84971
refactor: migrate CloseChatModal to GenericModal
amankv1234 Jan 28, 2026
fce4dcd
refactor: use GenericModal in EnterpriseDepartmentsModal
amankv1234 Jan 28, 2026
b5f4075
refactor: migrate ForwardChatModal to GenericModal
amankv1234 Jan 28, 2026
6550adb
refactor: migrate ReturnChatQueueModal to GenericModal
amankv1234 Jan 28, 2026
6decf0f
refactor: migrate ReturnChatQueueModal to GenericModal (RocketChat#38…
amankv1234 Jan 28, 2026
e9fe0c6
refactor: migrate ReturnChatQueueModal to GenericModal (RocketChat#3…
amankv1234 Jan 28, 2026
98ec15b
refactor: migrate CloseChatModal to GenericModal (RocketChat#38383)
amankv1234 Jan 28, 2026
89d4924
refactor: use GenericModal in EnterpriseDepartmentsModal (RocketChat#…
amankv1234 Jan 28, 2026
663df34
refactor: migrate ForwardChatModal to GenericModal (RocketChat#38383)
amankv1234 Jan 28, 2026
eb41c8b
refactor: migrate ReturnChatQueueModal to GenericModal (RocketChat#3…
amankv1234 Jan 28, 2026
446e80a
refactor: migrate CloseChatModal to GenericModal (RocketChat#38383)
amankv1234 Jan 28, 2026
29c044f
refactor: use GenericModal in EnterpriseDepartmentsModal (RocketChat#…
amankv1234 Jan 28, 2026
4fa5ef3
refactor: migrate ForwardChatModal to GenericModal (RocketChat#38383)
amankv1234 Jan 28, 2026
00fdad0
Merge branch 'develop' into patch-1
amankv1234 Jan 28, 2026
4ba5c38
refactor: migrate CloseChatModal to GenericModal (RocketChat#38383)
amankv1234 Jan 28, 2026
7ad0ee5
fix: avoid resetting transcript email subject on form updates
amankv1234 Jan 29, 2026
2adde50
Merge branch 'develop' into patch-1
amankv1234 Jan 29, 2026
7286d70
Merge branch 'develop' into patch-1
amankv1234 Jan 30, 2026
dddac10
Merge branch 'develop' into patch-1
amankv1234 Jan 31, 2026
80cb5c7
Merge branch 'develop' into patch-1
amankv1234 Jan 31, 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
Original file line number Diff line number Diff line change
@@ -1,42 +1,26 @@
import {
Button,
Modal,
ModalClose,
ModalContent,
ModalFooter,
ModalFooterControllers,
ModalHeader,
ModalIcon,
ModalTitle,
} from '@rocket.chat/fuselage';
import { GenericModal } from '@rocket.chat/ui-client';
import { useTranslation } from 'react-i18next';

type ReturnChatQueueModalProps = {
onMoveChat: () => void;
onCancel: () => void;
};

// TODO: use `GenericModal` instead of creating a new modal from scratch
const ReturnChatQueueModal = ({ onCancel, onMoveChat, ...props }: ReturnChatQueueModalProps) => {
const ReturnChatQueueModal = ({ onCancel, onMoveChat }: ReturnChatQueueModalProps) => {
const { t } = useTranslation();

return (
<Modal aria-label={t('Return_to_the_queue')} {...props}>
<ModalHeader>
<ModalIcon name='burger-arrow-left' />
<ModalTitle>{t('Return_to_the_queue')}</ModalTitle>
<ModalClose onClick={onCancel} />
</ModalHeader>
<ModalContent fontScale='p2'>{t('Would_you_like_to_return_the_queue')}</ModalContent>
<ModalFooter>
<ModalFooterControllers>
<Button onClick={onCancel}>{t('Cancel')}</Button>
<Button primary onClick={onMoveChat}>
{t('Confirm')}
</Button>
</ModalFooterControllers>
</ModalFooter>
</Modal>
<GenericModal
variant='warning'
icon='burger-arrow-left'
title={t('Return_to_the_queue')}
confirmText={t('Confirm')}
cancelText={t('Cancel')}
onConfirm={onMoveChat}
onCancel={onCancel}
>
{t('Would_you_like_to_return_the_queue')}
</GenericModal>
);
};

Expand Down
Loading