Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ import {
ModalContent,
} from '@rocket.chat/fuselage';
import { GenericModal } from '@rocket.chat/ui-client';
import { usePermission, useSetting, useTranslation, useUserPreference } from '@rocket.chat/ui-contexts';
import { usePermission, useSetting, useUserPreference, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
import { useCallback, useState, useEffect, useMemo } from 'react';
import { useForm } from 'react-hook-form';
import { useTranslation } from 'react-i18next';

import { useHasLicenseModule } from '../../../hooks/useHasLicenseModule';
import { dispatchToastMessage } from '../../../lib/toast';
import Tags from '../Tags';

type CloseChatModalFormData = {
Expand All @@ -50,7 +50,8 @@ type CloseChatModalProps = {
};

const CloseChatModal = ({ department, visitorEmail, onCancel, onConfirm }: CloseChatModalProps) => {
const t = useTranslation();
const { t } = useTranslation();
const dispatchToastMessage = useToastMessageDispatch();

const {
formState: { errors },
Expand Down Expand Up @@ -147,7 +148,7 @@ const CloseChatModal = ({ department, visitorEmail, onCancel, onConfirm }: Close
}
setValue('subject', subject || customSubject || t('Transcript_of_your_livechat_conversation'));
}
}, [transcriptEmail, setValue, visitorEmail, subject, t, customSubject]);
}, [transcriptEmail, setValue, visitorEmail, subject, t, customSubject, dispatchToastMessage]);

if (commentRequired || tagRequired || canSendTranscript) {
return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,18 @@ import { act, renderHook, waitFor } from '@testing-library/react';
import { E2EEState } from '../../../app/e2e/client/E2EEState';
import { e2e } from '../../../app/e2e/client/rocketchat.e2e';
import { OtrRoomState } from '../../../app/otr/lib/OtrRoomState';
import { dispatchToastMessage } from '../../lib/toast';
import { useRoom, useRoomSubscription } from '../../views/room/contexts/RoomContext';
import { useE2EEState } from '../../views/room/hooks/useE2EEState';
import { useOTR } from '../useOTR';
import { useE2EERoomAction } from './useE2EERoomAction';

const dispatchToastMessage = jest.fn();

jest.mock('@rocket.chat/ui-contexts', () => ({
useSetting: jest.fn(),
usePermission: jest.fn(),
useEndpoint: jest.fn(),
}));

jest.mock('../../lib/toast', () => ({
dispatchToastMessage: jest.fn(),
useToastMessageDispatch: jest.fn(() => dispatchToastMessage),
}));

jest.mock('@rocket.chat/ui-client', () => ({
Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/client/hooks/roomActions/useE2EERoomAction.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
import { isRoomFederated } from '@rocket.chat/core-typings';
import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
import { imperativeModal } from '@rocket.chat/ui-client';
import { useSetting, usePermission, useEndpoint } from '@rocket.chat/ui-contexts';
import { useSetting, usePermission, useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
import { useMemo } from 'react';
import { useTranslation } from 'react-i18next';

import { E2EEState } from '../../../app/e2e/client/E2EEState';
import { E2ERoomState } from '../../../app/e2e/client/E2ERoomState';
import { OtrRoomState } from '../../../app/otr/lib/OtrRoomState';
import { getRoomTypeTranslation } from '../../lib/getRoomTypeTranslation';
import { dispatchToastMessage } from '../../lib/toast';
import { useRoom, useRoomSubscription } from '../../views/room/contexts/RoomContext';
import type { RoomToolboxActionConfig } from '../../views/room/contexts/RoomToolboxContext';
import { useE2EERoomState } from '../../views/room/hooks/useE2EERoomState';
Expand All @@ -31,6 +30,7 @@ export const useE2EERoomAction = () => {
const permitted = (room.t === 'd' || (permittedToEditRoom && permittedToToggleEncryption)) && readyToEncrypt;
const federated = isRoomFederated(room);
const { t } = useTranslation();
const dispatchToastMessage = useToastMessageDispatch();
const { otrState } = useOTR();

const isE2EERoomNotReady = () => {
Expand Down
8 changes: 4 additions & 4 deletions apps/meteor/client/hooks/useDialModal.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import { useSetModal } from '@rocket.chat/ui-contexts';
import { useSetModal, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
import { Suspense, lazy, useCallback, useMemo } from 'react';
import { useTranslation } from 'react-i18next';

import { useIsVoipEnterprise } from '../contexts/CallContext';
import { dispatchToastMessage } from '../lib/toast';

const DialPadModal = lazy(() => import('../voip/modal/DialPad/DialPadModal'));

Expand All @@ -19,8 +18,9 @@ type DialModalControls = {

export const useDialModal = (): DialModalControls => {
const setModal = useSetModal();
const isEnterprise = useIsVoipEnterprise();
const { t } = useTranslation();
const dispatchToastMessage = useToastMessageDispatch();
const isEnterprise = useIsVoipEnterprise();

const closeDialModal = useCallback(() => setModal(null), [setModal]);

Expand All @@ -39,7 +39,7 @@ export const useDialModal = (): DialModalControls => {
</Suspense>,
);
},
[setModal, isEnterprise, t, closeDialModal],
[isEnterprise, setModal, closeDialModal, dispatchToastMessage, t],
);

return useMemo(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import type { IRoom } from '@rocket.chat/core-typings';
import { LivechatPriorityWeight } from '@rocket.chat/core-typings';
import { useEndpoint } from '@rocket.chat/ui-contexts';
import { useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
import { useQueryClient } from '@tanstack/react-query';
import { useMemo } from 'react';
import { useTranslation } from 'react-i18next';

import { useOmnichannelPriorities } from './useOmnichannelPriorities';
import { roomsQueryKeys } from '../../lib/queryKeys';
import { dispatchToastMessage } from '../../lib/toast';
import { PRIORITY_ICONS } from '../priorities/PriorityIcon';

export const useOmnichannelPrioritiesMenu = (rid: IRoom['_id']) => {
Expand All @@ -16,6 +15,7 @@ export const useOmnichannelPrioritiesMenu = (rid: IRoom['_id']) => {
const updateRoomPriority = useEndpoint('POST', '/v1/livechat/room/:rid/priority', { rid });
const removeRoomPriority = useEndpoint('DELETE', '/v1/livechat/room/:rid/priority', { rid });
const { data: priorities } = useOmnichannelPriorities();
const dispatchToastMessage = useToastMessageDispatch();

return useMemo(() => {
const handlePriorityChange = (priorityId: string) => async () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
import { useEndpoint, useLanguage } from '@rocket.chat/ui-contexts';
import { useEndpoint, useLanguage, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
import { useQuery } from '@tanstack/react-query';
import type { ChangeEvent, ReactElement } from 'react';
import { useEffect, useState, memo } from 'react';
Expand All @@ -8,7 +8,6 @@ import { useTranslation } from 'react-i18next';
import AutoTranslate from './AutoTranslate';
import { useEndpointAction } from '../../../../hooks/useEndpointAction';
import { miscQueryKeys } from '../../../../lib/queryKeys';
import { dispatchToastMessage } from '../../../../lib/toast';
import { useRoom, useRoomSubscription } from '../../contexts/RoomContext';
import { useRoomToolbox } from '../../contexts/RoomToolboxContext';

Expand All @@ -32,6 +31,8 @@ const AutoTranslateWithData = (): ReactElement => {

const languagesDict = supportedLanguages ? Object.fromEntries(supportedLanguages.map((lang) => [lang.language, lang.name])) : {};

const dispatchToastMessage = useToastMessageDispatch();

const handleChangeLanguage = useEffectEvent((value: string) => {
setCurrentLanguage(value);

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Box, ModalFooterAnnotation, ModalIcon } from '@rocket.chat/fuselage';
import { ExternalLink, GenericModal } from '@rocket.chat/ui-client';
import { useToastMessageDispatch } from '@rocket.chat/ui-contexts';
import type { ReactElement } from 'react';
import { Trans, useTranslation } from 'react-i18next';

import { dispatchToastMessage } from '../../../../lib/toast';
import { useE2EEResetRoomKey } from '../../hooks/useE2EEResetRoomKey';

const E2EE_RESET_KEY_LINK = 'https://go.rocket.chat/i/e2ee-guide';
Expand All @@ -18,6 +18,8 @@ const ResetKeysE2EEModal = ({ roomType, roomId, onCancel }: ResetKeysE2EEModalPr
const { t } = useTranslation();
const resetRoomKeyMutation = useE2EEResetRoomKey();

const dispatchToastMessage = useToastMessageDispatch();

const handleResetRoomKey = () => {
resetRoomKeyMutation.mutate(
{ roomId },
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import { RegisterServerPage, RegisterOfflinePage } from '@rocket.chat/onboarding-ui';
import { useEndpoint, useMethod } from '@rocket.chat/ui-contexts';
import { useEndpoint, useMethod, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
import { useMutation, useQuery } from '@tanstack/react-query';
import type { ReactElement, ComponentProps } from 'react';
import { useState } from 'react';
import { I18nextProvider, useTranslation } from 'react-i18next';

import { useInvalidateLicense } from '../../../hooks/useLicense';
import { dispatchToastMessage } from '../../../lib/toast';
import { useSetupWizardContext } from '../contexts/SetupWizardContext';

const SERVER_OPTIONS = {
Expand Down Expand Up @@ -53,6 +52,8 @@ const RegisterServerStep = (): ReactElement => {
select: (data) => data.offline,
});

const dispatchToastMessage = useToastMessageDispatch();

const { mutate } = useMutation({
mutationKey: ['setupWizard/confirmOfflineRegistration'],
mutationFn: async (token: string) => registerManually({ cloudBlob: token }),
Expand All @@ -79,13 +80,13 @@ const RegisterServerStep = (): ReactElement => {
termsHref='https://rocket.chat/terms'
policyHref='https://rocket.chat/privacy'
clientKey={clientKey || ''}
onCopySecurityCode={(): void => dispatchToastMessage({ type: 'success', message: t('Copied') })}
onBackButtonClick={(): void => setServerOption(SERVER_OPTIONS.REGISTERED)}
onCopySecurityCode={() => dispatchToastMessage({ type: 'success', message: t('Copied') })}
onBackButtonClick={() => setServerOption(SERVER_OPTIONS.REGISTERED)}
onSubmit={handleConfirmOffline}
/>
) : (
<RegisterServerPage
onClickRegisterOffline={(): void => setServerOption(SERVER_OPTIONS.OFFLINE)}
onClickRegisterOffline={() => setServerOption(SERVER_OPTIONS.OFFLINE)}
stepCount={maxSteps}
onSubmit={handleRegister}
currentStep={currentStep}
Expand Down
Loading