From cca963a63a50803999491468be17425f1aa458f4 Mon Sep 17 00:00:00 2001 From: Murtaza Patrawala <34130764+murtaza98@users.noreply.github.com> Date: Wed, 31 Mar 2021 20:13:05 +0530 Subject: [PATCH] Regression: Quick action button missing for Omnichannel On-Hold queue (#21285) * Move manual OnHold button to header + Minor fixes * Move On Hold client files to ee folder * Cleanup * Move Visitor abandoment setting to EE * Add new on-hold icon * Fix settings. * Fix setting file. Co-authored-by: Renato Becker --- client/contexts/ServerContext/endpoints.ts | 2 + .../endpoints/v1/livechat/onHold.ts | 5 + client/providers/OmniChannelProvider.tsx | 1 + .../Omnichannel/QuickActions/QuickActions.tsx | 23 +++++ client/views/room/lib/QuickActions/index.tsx | 3 +- .../modals/PlaceChatOnHoldModal.tsx | 40 ++++++++ ee/app/livechat-enterprise/client/index.js | 1 + .../lib/QuickActions/defaultActions.ts | 9 ++ package-lock.json | 99 ++++++++++--------- package.json | 18 ++-- packages/rocketchat-i18n/i18n/en.i18n.json | 2 +- 11 files changed, 143 insertions(+), 60 deletions(-) create mode 100644 client/contexts/ServerContext/endpoints/v1/livechat/onHold.ts create mode 100644 ee/app/livechat-enterprise/client/components/modals/PlaceChatOnHoldModal.tsx create mode 100644 ee/app/livechat-enterprise/lib/QuickActions/defaultActions.ts diff --git a/client/contexts/ServerContext/endpoints.ts b/client/contexts/ServerContext/endpoints.ts index 1da5d4cc8a39..0f769f17b5d7 100644 --- a/client/contexts/ServerContext/endpoints.ts +++ b/client/contexts/ServerContext/endpoints.ts @@ -15,6 +15,7 @@ import { ListEndpoint as EmojiCustomListEndpoint } from './endpoints/v1/emoji-cu import { GetDiscussionsEndpoint as ChatGetDiscussionsEndpoint } from './endpoints/v1/chat/getDiscussions'; import { GetThreadsListEndpoint as ChatGetThreadsListEndpoint } from './endpoints/v1/chat/getThreadsList'; import { LivechatVisitorInfoEndpoint } from './endpoints/v1/livechat/visitorInfo'; +import { LivechatRoomOnHoldEndpoint } from './endpoints/v1/livechat/onHold'; export type ServerEndpoints = { 'chat.getMessage': ChatGetMessageEndpoint; @@ -34,6 +35,7 @@ export type ServerEndpoints = { 'rooms.autocomplete.channelAndPrivate': RoomsAutocompleteEndpoint; 'teams.addRooms': TeamsAddRoomsEndpoint; 'livechat/visitors.info': LivechatVisitorInfoEndpoint; + 'livechat/room.onHold': LivechatRoomOnHoldEndpoint; }; export type ServerEndpointPath = keyof ServerEndpoints; diff --git a/client/contexts/ServerContext/endpoints/v1/livechat/onHold.ts b/client/contexts/ServerContext/endpoints/v1/livechat/onHold.ts new file mode 100644 index 000000000000..9757fa92b9b2 --- /dev/null +++ b/client/contexts/ServerContext/endpoints/v1/livechat/onHold.ts @@ -0,0 +1,5 @@ +export type LivechatRoomOnHoldEndpoint = { + POST: (roomId: string) => { + success: boolean; + }; +}; diff --git a/client/providers/OmniChannelProvider.tsx b/client/providers/OmniChannelProvider.tsx index e7265c2e405f..3e4666b576b0 100644 --- a/client/providers/OmniChannelProvider.tsx +++ b/client/providers/OmniChannelProvider.tsx @@ -96,6 +96,7 @@ const OmnichannelEnabledProvider: FC = ({ children }) => { setContextValue((context) => ({ ...context, agentAvailable: user?.statusLivechat === 'available', + ...routeConfig && { routeConfig }, })); }, [user?.statusLivechat, routeConfig]); diff --git a/client/views/room/Header/Omnichannel/QuickActions/QuickActions.tsx b/client/views/room/Header/Omnichannel/QuickActions/QuickActions.tsx index 690fa756672c..9eff205f3c7d 100644 --- a/client/views/room/Header/Omnichannel/QuickActions/QuickActions.tsx +++ b/client/views/room/Header/Omnichannel/QuickActions/QuickActions.tsx @@ -21,6 +21,8 @@ import { useAtLeastOnePermission, usePermission, useRole } from '../../../../../ import { useUserId } from '../../../../../contexts/UserContext'; import { useOmnichannelRouteConfig } from '../../../../../contexts/OmnichannelContext'; import { useEndpoint, useMethod } from '../../../../../contexts/ServerContext'; +import { useSetting } from '../../../../../contexts/SettingsContext'; +import PlaceChatOnHoldModal from '../../../../../../ee/app/livechat-enterprise/client/components/modals/PlaceChatOnHoldModal'; const QuickActions = ({ room, className }: { room: IRoom; className: BoxProps['className'] }): JSX.Element => { @@ -137,6 +139,18 @@ const QuickActions = ({ room, className }: { room: IRoom; className: BoxProps['c } }, [closeChat, closeModal, rid, t]); + const onHoldChat = useEndpoint('POST', 'livechat/room.onHold'); + + const handleOnHoldChat = useCallback(async () => { + try { + await onHoldChat({ roomId: rid } as any); + closeModal(); + toastr.success(t('Chat_On_Hold_Successfully')); + } catch (error) { + handleError(error); + } + }, [onHoldChat, closeModal, rid, t]); + const openModal = useMutableCallback((id: string) => { switch (id) { case QuickActionsEnum.MoveQueue: @@ -151,6 +165,9 @@ const QuickActions = ({ room, className }: { room: IRoom; className: BoxProps['c case QuickActionsEnum.CloseChat: setModal(); break; + case QuickActionsEnum.OnHoldChat: + setModal(); + break; default: break; } @@ -162,6 +179,8 @@ const QuickActions = ({ room, className }: { room: IRoom; className: BoxProps['c openModal(id); }); + const manualOnHoldAllowed = useSetting('Livechat_allow_manual_on_hold'); + const hasManagerRole = useRole('livechat-manager'); const roomOpen = room && room.open && ((room.servedBy && room.servedBy._id === uid) || hasManagerRole); @@ -172,6 +191,8 @@ const QuickActions = ({ room, className }: { room: IRoom; className: BoxProps['c const canCloseRoom = usePermission('close-others-livechat-room'); + const canPlaceChatOnHold = (!room.onHold && room.u && !(room as any).lastMessage?.token && manualOnHoldAllowed) as boolean; + const omnichannelRouteConfig = useOmnichannelRouteConfig(); const hasPermissionButtons = (id: string): boolean => { @@ -184,6 +205,8 @@ const QuickActions = ({ room, className }: { room: IRoom; className: BoxProps['c return !!email && canSendTranscript; case QuickActionsEnum.CloseChat: return !!roomOpen && canCloseRoom; + case QuickActionsEnum.OnHoldChat: + return !!roomOpen && canPlaceChatOnHold; default: break; } diff --git a/client/views/room/lib/QuickActions/index.tsx b/client/views/room/lib/QuickActions/index.tsx index 8ceed9f3ae0c..dfcfdc8796fa 100644 --- a/client/views/room/lib/QuickActions/index.tsx +++ b/client/views/room/lib/QuickActions/index.tsx @@ -43,5 +43,6 @@ export enum QuickActionsEnum { MoveQueue = 'rocket-move-to-queue', ChatForward = 'rocket-chat-forward', Transcript = 'rocket-transcript', - CloseChat = 'rocket-close-chat' + CloseChat = 'rocket-close-chat', + OnHoldChat = 'rocket-on-hold-chat', } diff --git a/ee/app/livechat-enterprise/client/components/modals/PlaceChatOnHoldModal.tsx b/ee/app/livechat-enterprise/client/components/modals/PlaceChatOnHoldModal.tsx new file mode 100644 index 000000000000..9cc8fe18fc2f --- /dev/null +++ b/ee/app/livechat-enterprise/client/components/modals/PlaceChatOnHoldModal.tsx @@ -0,0 +1,40 @@ +import { Box, Button, ButtonGroup, Icon, Modal } from '@rocket.chat/fuselage'; +import React, { FC } from 'react'; + +import { useTranslation } from '../../../../../../client/contexts/TranslationContext'; +import { RequiredModalProps } from '../../../../../../client/components/withDoNotAskAgain'; + +type PlaceChatOnHoldModalProps = RequiredModalProps & { + onOnHoldChat: () => void; + onCancel: () => void; +}; + +const PlaceChatOnHoldModal: FC = ({ + onCancel, + onOnHoldChat, + confirm = onOnHoldChat, + ...props +}) => { + const t = useTranslation(); + + return + + + {t('Livechat_onHold_Chat')} + + + + {t('Would_you_like_to_place_chat_on_hold')} + + + + + + + + + + ; +}; + +export default PlaceChatOnHoldModal; diff --git a/ee/app/livechat-enterprise/client/index.js b/ee/app/livechat-enterprise/client/index.js index 63adb051f6a5..4ab46ea08d90 100644 --- a/ee/app/livechat-enterprise/client/index.js +++ b/ee/app/livechat-enterprise/client/index.js @@ -11,4 +11,5 @@ hasLicense('livechat-enterprise').then((enabled) => { require('./views/app/registerCustomTemplates'); require('./views/livechatSideNavItems'); require('./views/business-hours/Multiple'); + require('../lib/QuickActions/defaultActions'); }); diff --git a/ee/app/livechat-enterprise/lib/QuickActions/defaultActions.ts b/ee/app/livechat-enterprise/lib/QuickActions/defaultActions.ts new file mode 100644 index 000000000000..e3c5b01af4b2 --- /dev/null +++ b/ee/app/livechat-enterprise/lib/QuickActions/defaultActions.ts @@ -0,0 +1,9 @@ +import { addAction, QuickActionsEnum } from '../../../../../client/views/room/lib/QuickActions'; + +addAction(QuickActionsEnum.OnHoldChat, { + groups: ['live'], + id: QuickActionsEnum.OnHoldChat, + title: 'Livechat_onHold_Chat', + icon: 'pause-unfilled', + order: 5, +}); diff --git a/package-lock.json b/package-lock.json index f5b59b6a42e4..5f65326b4749 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5014,9 +5014,9 @@ } }, "@juggle/resize-observer": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@juggle/resize-observer/-/resize-observer-3.2.0.tgz", - "integrity": "sha512-fsLxt0CHx2HCV9EL8lDoVkwHffsA0snUpddYjdLyXcG5E41xaamn9ZyQqOE9TUJdrRlH8/hjIf+UdOdDeKCUgg==" + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/@juggle/resize-observer/-/resize-observer-3.3.0.tgz", + "integrity": "sha512-P1v2nvK7z2gOLVM/bveIRLG9L99uEahTGgTltyF03zixZAjI9YmKLj5Z9MpS9wBIUt5WDoQORT2lXvLOIF89iA==" }, "@kossnocorp/desvg": { "version": "0.2.0", @@ -5927,26 +5927,26 @@ } }, "@rocket.chat/css-in-js": { - "version": "0.6.3-dev.180", - "resolved": "https://registry.npmjs.org/@rocket.chat/css-in-js/-/css-in-js-0.6.3-dev.180.tgz", - "integrity": "sha512-j34Yv+O7J0h7vG0wNe3zjteaCz3ZNJ4fyNldte5+ByiqS/LanQpQYA08+Srvtb2LCI177E9pJHQ4o0UBxIhPUg==", + "version": "0.6.3-dev.205", + "resolved": "https://registry.npmjs.org/@rocket.chat/css-in-js/-/css-in-js-0.6.3-dev.205.tgz", + "integrity": "sha512-RMm2sNTb5bSKNkp1Vgs3SEywSudqo6shCWWghkStf8uf3EWiGsohB2vZGMtHZ1D4MoDDBGGZRfC07cItf/D7fA==", "requires": { "@emotion/hash": "^0.8.0", - "@rocket.chat/memo": "^0.6.3-dev.180+2425c045", + "@rocket.chat/memo": "^0.6.3-dev.205+6d3c811f", "stylis": "^4.0.6" }, "dependencies": { "stylis": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.0.7.tgz", - "integrity": "sha512-OFFeUXFgwnGOKvEXaSv0D0KQ5ADP0n6g3SVONx6I/85JzNZ3u50FRwB3lVIk1QO2HNdI75tbVzc4Z66Gdp9voA==" + "version": "4.0.9", + "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.0.9.tgz", + "integrity": "sha512-ci7pEFNVW3YJiWEzqPOMsAjY6kgraZ3ZgBfQ5HYbNtLJEsQ0G46ejWZpfSSCp/FaSiCSGGhzL9O2lN+2cB6ong==" } } }, "@rocket.chat/emitter": { - "version": "0.6.3-dev.185", - "resolved": "https://registry.npmjs.org/@rocket.chat/emitter/-/emitter-0.6.3-dev.185.tgz", - "integrity": "sha512-23TNzv+sS8cDT1MQl402QVsI4OEcnChtOhru6TyQqCndfpvBBObmiATgxFnClA6HQA5pXt8qMGxUl/UXDXKs0A==" + "version": "0.6.3-dev.205", + "resolved": "https://registry.npmjs.org/@rocket.chat/emitter/-/emitter-0.6.3-dev.205.tgz", + "integrity": "sha512-Lj7MIi/iVWV/2YzxFd5KBt3D7sbbfZ9js0v2BNDGzHSgv6p38iUR3gVjjyizJ8VAW+/z2rw3gjWqmGThX8Y5ZQ==" }, "@rocket.chat/eslint-config": { "version": "0.3.0", @@ -5958,9 +5958,9 @@ } }, "@rocket.chat/fuselage": { - "version": "0.6.3-dev.203", - "resolved": "https://registry.npmjs.org/@rocket.chat/fuselage/-/fuselage-0.6.3-dev.203.tgz", - "integrity": "sha512-AJGZaFIBc6zOHpoBlrLKUsNaSCw6El1WTvHVFEQyzpRWhHGyvEz77T69ZIE7Vb8xGrbwj452OyWks+95R4eOYg==", + "version": "0.6.3-dev.206", + "resolved": "https://registry.npmjs.org/@rocket.chat/fuselage/-/fuselage-0.6.3-dev.206.tgz", + "integrity": "sha512-pvvxCyK3M1zqkxS8+9PzmPm8V60uycKFAOqWc31ybHbbR18PkIQH1xcCxh1MUBHwuV3nERe56mpJM03ifOw0xw==", "requires": { "@rocket.chat/css-in-js": "^0.22.0", "@rocket.chat/fuselage-tokens": "^0.22.0", @@ -5992,32 +5992,32 @@ "integrity": "sha512-FhkZFE/HRjBTUG81TNPwILoJQZihyvhKT/XF2Zo8FxBQeDYXpMdyU/scesw8PpNZFTFEjMT7WEu5+QWVkVoq1A==" }, "stylis": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.0.7.tgz", - "integrity": "sha512-OFFeUXFgwnGOKvEXaSv0D0KQ5ADP0n6g3SVONx6I/85JzNZ3u50FRwB3lVIk1QO2HNdI75tbVzc4Z66Gdp9voA==" + "version": "4.0.9", + "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.0.9.tgz", + "integrity": "sha512-ci7pEFNVW3YJiWEzqPOMsAjY6kgraZ3ZgBfQ5HYbNtLJEsQ0G46ejWZpfSSCp/FaSiCSGGhzL9O2lN+2cB6ong==" } } }, "@rocket.chat/fuselage-hooks": { - "version": "0.6.3-dev.178", - "resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-hooks/-/fuselage-hooks-0.6.3-dev.178.tgz", - "integrity": "sha512-IBIs1zuMal2QT7AoWvAuhcYmq4J4KWazwjBx9Q0WudUQjLa/ipqwQmLEYVYEysfYI1OG4S1gPg9XDBY7TGvOsw==", + "version": "0.6.3-dev.205", + "resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-hooks/-/fuselage-hooks-0.6.3-dev.205.tgz", + "integrity": "sha512-jnTxmdzG9vIrx7tKG8ZwdyjN+11RHtjYRBF5jAXhQbHWG04CcOG4gVYsWEoVOa1ab9I76SMfwDRML/JICb7/Lg==", "requires": { - "@rocket.chat/fuselage-tokens": "^0.6.3-dev.178+dbd5b908", + "@rocket.chat/fuselage-tokens": "^0.6.3-dev.205+6d3c811f", "use-subscription": "^1.4.1" }, "dependencies": { "@rocket.chat/fuselage-tokens": { - "version": "0.6.3-dev.178", - "resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-tokens/-/fuselage-tokens-0.6.3-dev.178.tgz", - "integrity": "sha512-P5NOTCDd4BVNX+CnaQXLJLTJDLbGZKFttjzNOVc7mlWqDxPZsDRPv/pnSP6RP38mWe2HwHVkQi2CDLcaJnGCcA==" + "version": "0.6.3-dev.205", + "resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-tokens/-/fuselage-tokens-0.6.3-dev.205.tgz", + "integrity": "sha512-4ACSLapZpzLtaZPxdcrxyKTleZYjpEMk+NCpFtr7TuG3qBQP239XSR6b4/7yaQw3h7DUzatcpUWyNxfAnkUl5A==" } } }, "@rocket.chat/fuselage-polyfills": { - "version": "0.6.3-dev.181", - "resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-polyfills/-/fuselage-polyfills-0.6.3-dev.181.tgz", - "integrity": "sha512-fz49lo58YHmBVAHRKyOYSIwi5cPIkt+vkYQCs+lSJb2ou3ur92zQxjze3+86AwDpZz82iA9h156s/oj4+63RZQ==", + "version": "0.22.1-dev.0", + "resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-polyfills/-/fuselage-polyfills-0.22.1-dev.0.tgz", + "integrity": "sha512-eMDOiq5lXUXuXgF/Dz2/FQs0PosXlpLGC3iCsYmNI/LxAPJbwQ/PRSRNrQczRrWpeVpqPKzkoaJosGzVAlqWBg==", "requires": { "@juggle/resize-observer": "^3.2.0", "clipboard-polyfill": "^3.0.1", @@ -6033,31 +6033,32 @@ "integrity": "sha512-gVzQHhUsZSLbIkwGi8f1KpsTepkmtwHs7hl1gGr0HrnI4eYhBWpMOEjdiH3czhPuoF/O4C8QjdpDrktIuwkVNQ==" }, "@rocket.chat/fuselage-ui-kit": { - "version": "0.6.3-dev.184", - "resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-ui-kit/-/fuselage-ui-kit-0.6.3-dev.184.tgz", - "integrity": "sha512-xO1FuY9bCKTOKOANbRi189Uq0j6+pVSKaV3E5C3TYvWuMhwE2Lfq4gbiH/uEn5cnrVdR1HOJaaskCxkraGqTVg==", + "version": "0.6.3-dev.206", + "resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-ui-kit/-/fuselage-ui-kit-0.6.3-dev.206.tgz", + "integrity": "sha512-/jX4N1RtDhMEQe7Tj7sjBhMoAkS6JgNph1zy93GaICP1d6PVfKN9yOL/bnZoTlPqO8MAIa6jOBAflNzpWjZDAw==", "requires": { - "@rocket.chat/fuselage-polyfills": "^0.21.0" + "@rocket.chat/fuselage-polyfills": "^0.22.0" }, "dependencies": { "@rocket.chat/fuselage-polyfills": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-polyfills/-/fuselage-polyfills-0.21.0.tgz", - "integrity": "sha512-B27f5PSlIaRJbieyh0i+BpWN5mrouE9Jhetg7FD+F8/S/azqAmXZNzgDLh8QFF0qy6ne72Y6w3Hw9PfXCsVjag==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-polyfills/-/fuselage-polyfills-0.22.0.tgz", + "integrity": "sha512-hIAN9iIp3w5T9lTdTOG4QIYgZosc2sbZrNLBYiEMJpBnHY85f9FjD7YPazbNplxCVCEDIxdzUkod4at8Y8iGYA==", "requires": { "@juggle/resize-observer": "^3.2.0", "clipboard-polyfill": "^3.0.1", "element-closest-polyfill": "^1.0.2", "focus-visible": "^5.2.0", - "focus-within-polyfill": "^5.1.0" + "focus-within-polyfill": "^5.1.0", + "new-event-polyfill": "^1.0.1" } } } }, "@rocket.chat/icons": { - "version": "0.6.3-dev.202", - "resolved": "https://registry.npmjs.org/@rocket.chat/icons/-/icons-0.6.3-dev.202.tgz", - "integrity": "sha512-Tsg7wdHWiUunhyWTAa+pO9m6bdM3wLJ+t3jYfSUXn9FsumHsR7f+g4GjSJsHvw65Ly3b5TJcs917YKCtb/h5Gg==", + "version": "0.6.3-dev.206", + "resolved": "https://registry.npmjs.org/@rocket.chat/icons/-/icons-0.6.3-dev.206.tgz", + "integrity": "sha512-uyoGu8NGzOdn+RSdFgzreM6Wmgks3LEhg42mbfygcGRP6oXpO769iD0UUY3FdeLrcRBh4/91ly3kAukAG+691Q==", "dev": true }, "@rocket.chat/livechat": { @@ -6113,14 +6114,14 @@ } }, "@rocket.chat/memo": { - "version": "0.6.3-dev.180", - "resolved": "https://registry.npmjs.org/@rocket.chat/memo/-/memo-0.6.3-dev.180.tgz", - "integrity": "sha512-3+zoOZW/f2/cwmjDAh8yXvGQvskopSR/QCAUmatqSAiMztFvkBljlVbSx1YUiq4y5t41dzM5m+MKYRZAEgAtLQ==" + "version": "0.6.3-dev.205", + "resolved": "https://registry.npmjs.org/@rocket.chat/memo/-/memo-0.6.3-dev.205.tgz", + "integrity": "sha512-xrwGKR2kn3VNMBw4BFHDeoU0bxF3EClxrKWKzsvmELx+qo2x4hk7HXZyZ2Z8IdmSWJS/yNCq0jv6T6A2k8KnqQ==" }, "@rocket.chat/mp3-encoder": { - "version": "0.6.3-dev.178", - "resolved": "https://registry.npmjs.org/@rocket.chat/mp3-encoder/-/mp3-encoder-0.6.3-dev.178.tgz", - "integrity": "sha512-UKKHgaWUsmNKqGrYhkDbCoMJVEIVBYhkCKdajwGt+kpfO/G6SrJc4IlKH2fnYuMkUMzuBEMWvoq9kwSbWzTUrA==", + "version": "0.6.3-dev.205", + "resolved": "https://registry.npmjs.org/@rocket.chat/mp3-encoder/-/mp3-encoder-0.6.3-dev.205.tgz", + "integrity": "sha512-q9sRpjPvU6qf5JZAy6Gii7nmHGVYhp2YZmdzC9/rdL1D9VIZtvPfvfroQUw8K/rsgPylGzSjcTNd3cUx4Asorw==", "requires": { "lamejs": "git+https://github.com/zhuker/lamejs.git" } @@ -6168,9 +6169,9 @@ } }, "@rocket.chat/ui-kit": { - "version": "0.6.3-dev.178", - "resolved": "https://registry.npmjs.org/@rocket.chat/ui-kit/-/ui-kit-0.6.3-dev.178.tgz", - "integrity": "sha512-T1grAJi+aCicKQMzDQ3r2zG1CB7FE9idY2QkXQoIjI0Vj4sTqPtzq57yE3AFkgzWxrzsMU/xHPhiEhPDqbsgOw==" + "version": "0.6.3-dev.205", + "resolved": "https://registry.npmjs.org/@rocket.chat/ui-kit/-/ui-kit-0.6.3-dev.205.tgz", + "integrity": "sha512-9n8+5N7MBKUJSliNKMDqNcWJEmG6TjBk4637LezPP9t/gbVz0KlJg4ITWV1NhPXWoQkXOj26C/uVqWhZjyNyXA==" }, "@samverschueren/stream-to-observable": { "version": "0.3.1", diff --git a/package.json b/package.json index b198d05c07f7..abc4c9d08819 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "@babel/register": "^7.12.1", "@octokit/rest": "^16.43.2", "@rocket.chat/eslint-config": "^0.3.0", - "@rocket.chat/icons": "^0.6.3-dev.202", + "@rocket.chat/icons": "^0.6.3-dev.206", "@rocket.chat/livechat": "^1.9.0", "@settlin/spacebars-loader": "^1.0.8", "@storybook/addon-essentials": "^6.1.11", @@ -138,15 +138,15 @@ "@nivo/line": "^0.61.1", "@nivo/pie": "^0.61.1", "@rocket.chat/apps-engine": "1.24.0-alpha.4777", - "@rocket.chat/css-in-js": "^0.6.3-dev.180", - "@rocket.chat/emitter": "^0.6.3-dev.185", - "@rocket.chat/fuselage": "^0.6.3-dev.203", - "@rocket.chat/fuselage-hooks": "^0.6.3-dev.178", - "@rocket.chat/fuselage-polyfills": "^0.6.3-dev.181", + "@rocket.chat/css-in-js": "^0.6.3-dev.205", + "@rocket.chat/emitter": "^0.6.3-dev.205", + "@rocket.chat/fuselage": "^0.6.3-dev.206", + "@rocket.chat/fuselage-hooks": "^0.6.3-dev.205", + "@rocket.chat/fuselage-polyfills": "^0.22.1-dev.0", "@rocket.chat/fuselage-tokens": "^0.21.0", - "@rocket.chat/fuselage-ui-kit": "^0.6.3-dev.184", - "@rocket.chat/mp3-encoder": "^0.6.3-dev.178", - "@rocket.chat/ui-kit": "^0.6.3-dev.178", + "@rocket.chat/fuselage-ui-kit": "^0.6.3-dev.206", + "@rocket.chat/mp3-encoder": "^0.6.3-dev.205", + "@rocket.chat/ui-kit": "^0.6.3-dev.205", "@slack/client": "^4.12.0", "@types/dompurify": "^2.2.1", "@types/fibers": "^3.1.0", diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json index cdde60996795..68895ad417bd 100644 --- a/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/packages/rocketchat-i18n/i18n/en.i18n.json @@ -2573,7 +2573,7 @@ "Mailing": "Mailing", "Make_Admin": "Make Admin", "Make_sure_you_have_a_copy_of_your_codes_1": "Make sure you have a copy of your codes:", - "Make_sure_you_have_a_copy_of_your_codes_2": "If you lose access to your authenticator app, you can use one of these codes to log in.", + "Make_sure_you_have_a_copy_of_your_codes_2": "If you lose access to your authenticator app, you can use one of these codes to log in.", "manage-apps": "Manage Apps", "manage-apps_description": "Permission to manage all apps", "manage-assets": "Manage Assets",