diff --git a/apps/meteor/client/sidebar/Item/Condensed.tsx b/apps/meteor/client/sidebar/Item/Condensed.tsx index 8ad14852238b..2378bbd05375 100644 --- a/apps/meteor/client/sidebar/Item/Condensed.tsx +++ b/apps/meteor/client/sidebar/Item/Condensed.tsx @@ -42,7 +42,7 @@ const Condensed: FC = ({ icon, title = '', avatar, actions, href {badges && {badges}} {menu && ( - {menuVisibility ? menu() : } + {menuVisibility ? menu() : } )} diff --git a/apps/meteor/client/sidebar/Item/Extended.tsx b/apps/meteor/client/sidebar/Item/Extended.tsx index 99a409aa3793..a80a86551a67 100644 --- a/apps/meteor/client/sidebar/Item/Extended.tsx +++ b/apps/meteor/client/sidebar/Item/Extended.tsx @@ -70,7 +70,7 @@ const Extended: VFC = ({ {badges} {menu && ( - {menuVisibility ? menu() : } + {menuVisibility ? menu() : } )} diff --git a/apps/meteor/client/sidebar/Item/Medium.tsx b/apps/meteor/client/sidebar/Item/Medium.tsx index 850495810896..6511713b0f17 100644 --- a/apps/meteor/client/sidebar/Item/Medium.tsx +++ b/apps/meteor/client/sidebar/Item/Medium.tsx @@ -41,7 +41,7 @@ const Medium: VFC = ({ icon, title = '', avatar, actions, href, bad {badges && {badges}} {menu && ( - {menuVisibility ? menu() : } + {menuVisibility ? menu() : } )} diff --git a/apps/meteor/client/sidebar/footer/voip/VoipFooter.tsx b/apps/meteor/client/sidebar/footer/voip/VoipFooter.tsx index 85320d478f18..8716b0468de9 100644 --- a/apps/meteor/client/sidebar/footer/voip/VoipFooter.tsx +++ b/apps/meteor/client/sidebar/footer/voip/VoipFooter.tsx @@ -96,7 +96,6 @@ export const VoipFooter = ({ color={muted ? 'neutral-500' : 'info'} icon='mic' small - square onClick={(e): void => { e.stopPropagation(); toggleMic(!muted); @@ -108,7 +107,6 @@ export const VoipFooter = ({ icon='pause-unfilled' color={paused ? 'neutral-500' : 'info'} small - square onClick={handleHold} /> {options && } diff --git a/apps/meteor/client/sidebar/header/actions/CreateRoom.tsx b/apps/meteor/client/sidebar/header/actions/CreateRoom.tsx index 167765ef8870..4e8286511327 100644 --- a/apps/meteor/client/sidebar/header/actions/CreateRoom.tsx +++ b/apps/meteor/client/sidebar/header/actions/CreateRoom.tsx @@ -1,4 +1,4 @@ -import { Box, Sidebar, Dropdown } from '@rocket.chat/fuselage'; +import { Sidebar, Dropdown } from '@rocket.chat/fuselage'; import { useAtLeastOnePermission } from '@rocket.chat/ui-contexts'; import React, { HTMLAttributes, useRef, VFC } from 'react'; import { createPortal } from 'react-dom'; @@ -17,11 +17,7 @@ const CreateRoom: VFC, 'is'>> = (props) => { return ( <> - {showCreate && ( - - toggle()} /> - - )} + {showCreate && toggle()} {...props} ref={reference} />} {isVisible && createPortal( diff --git a/apps/meteor/client/sidebar/header/actions/Sort.tsx b/apps/meteor/client/sidebar/header/actions/Sort.tsx index aed9b932314f..f586255e406f 100644 --- a/apps/meteor/client/sidebar/header/actions/Sort.tsx +++ b/apps/meteor/client/sidebar/header/actions/Sort.tsx @@ -1,4 +1,4 @@ -import { Box, Sidebar, Dropdown } from '@rocket.chat/fuselage'; +import { Sidebar, Dropdown } from '@rocket.chat/fuselage'; import React, { VFC, useRef, HTMLAttributes } from 'react'; import { createPortal } from 'react-dom'; @@ -12,9 +12,7 @@ const Sort: VFC, 'is'>> = (props) => { return ( <> - - toggle()} /> - + toggle()} ref={reference} /> {isVisible && createPortal( diff --git a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallDialPad.tsx b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallDialPad.tsx index afcbd4c8bdc7..29bbd30eed1d 100644 --- a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallDialPad.tsx +++ b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallDialPad.tsx @@ -5,7 +5,7 @@ import React, { ReactElement } from 'react'; import { useVoipOutboundStates } from '../../../contexts/CallContext'; import { useDialModal } from '../../../hooks/useDialModal'; -export const OmniChannelCallDialPad = (): ReactElement => { +export const OmniChannelCallDialPad = ({ ...props }): ReactElement => { const t = useTranslation(); const { openDialModal } = useDialModal(); @@ -18,6 +18,7 @@ export const OmniChannelCallDialPad = (): ReactElement => { icon='dialpad' onClick={(): void => openDialModal()} disabled={!outBoundCallsEnabledForUser} + {...props} /> ); }; diff --git a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggle.tsx b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggle.tsx index 3edfa2558c63..13d7a77b160d 100644 --- a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggle.tsx +++ b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggle.tsx @@ -5,16 +5,16 @@ import { OmnichannelCallToggleError } from './OmnichannelCallToggleError'; import { OmnichannelCallToggleLoading } from './OmnichannelCallToggleLoading'; import { OmnichannelCallToggleReady } from './OmnichannelCallToggleReady'; -export const OmnichannelCallToggle = (): ReactElement => { +export const OmnichannelCallToggle = ({ ...props }): ReactElement => { const isCallReady = useIsCallReady(); const isCallError = useIsCallError(); if (isCallError) { - return ; + return ; } if (!isCallReady) { - return ; + return ; } - return ; + return ; }; diff --git a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleError.tsx b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleError.tsx index ecaa9684e67c..0d5d7817f9c4 100644 --- a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleError.tsx +++ b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleError.tsx @@ -2,7 +2,7 @@ import { Sidebar } from '@rocket.chat/fuselage'; import { useTranslation } from '@rocket.chat/ui-contexts'; import React, { ReactElement } from 'react'; -export const OmnichannelCallToggleError = (): ReactElement => { +export const OmnichannelCallToggleError = ({ ...props }): ReactElement => { const t = useTranslation(); - return ; + return ; }; diff --git a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleLoading.tsx b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleLoading.tsx index 61b08a1b2926..83e9d26a2e57 100644 --- a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleLoading.tsx +++ b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleLoading.tsx @@ -2,7 +2,7 @@ import { Sidebar } from '@rocket.chat/fuselage'; import { useTranslation } from '@rocket.chat/ui-contexts'; import React, { ReactElement } from 'react'; -export const OmnichannelCallToggleLoading = (): ReactElement => { +export const OmnichannelCallToggleLoading = ({ ...props }): ReactElement => { const t = useTranslation(); - return ; + return ; }; diff --git a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleReady.tsx b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleReady.tsx index 2eca933324da..5fb4424e06eb 100644 --- a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleReady.tsx +++ b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleReady.tsx @@ -4,7 +4,7 @@ import React, { ReactElement, useCallback } from 'react'; import { useCallerInfo, useCallRegisterClient, useCallUnregisterClient } from '../../../contexts/CallContext'; -export const OmnichannelCallToggleReady = (): ReactElement => { +export const OmnichannelCallToggleReady = ({ ...props }): ReactElement => { const t = useTranslation(); const caller = useCallerInfo(); @@ -59,5 +59,5 @@ export const OmnichannelCallToggleReady = (): ReactElement => { color: getColor(), }; - return ; + return ; }; diff --git a/apps/meteor/client/views/admin/customEmoji/EditCustomEmoji.tsx b/apps/meteor/client/views/admin/customEmoji/EditCustomEmoji.tsx index 4a27dc87c231..5b3982e89291 100644 --- a/apps/meteor/client/views/admin/customEmoji/EditCustomEmoji.tsx +++ b/apps/meteor/client/views/admin/customEmoji/EditCustomEmoji.tsx @@ -152,7 +152,7 @@ const EditCustomEmoji: FC = ({ close, onChange, data, ...p {t('Custom_Emoji')} - + {newEmojiPreview && ( diff --git a/apps/meteor/client/views/admin/customSounds/AdminSoundsRoute.tsx b/apps/meteor/client/views/admin/customSounds/AdminSoundsRoute.tsx index 9d444231eaea..77c44d694bc0 100644 --- a/apps/meteor/client/views/admin/customSounds/AdminSoundsRoute.tsx +++ b/apps/meteor/client/views/admin/customSounds/AdminSoundsRoute.tsx @@ -120,7 +120,6 @@ function CustomSoundsRoute(): ReactElement { { e.preventDefault(); diff --git a/apps/meteor/client/views/omnichannel/currentChats/RemoveAllClosed.tsx b/apps/meteor/client/views/omnichannel/currentChats/RemoveAllClosed.tsx index b89f6a1c5ded..b6249c60570b 100644 --- a/apps/meteor/client/views/omnichannel/currentChats/RemoveAllClosed.tsx +++ b/apps/meteor/client/views/omnichannel/currentChats/RemoveAllClosed.tsx @@ -31,7 +31,7 @@ const RemoveAllClosed: FC<{ }, }), }; - return ; + return ; }; export default RemoveAllClosed; diff --git a/apps/meteor/client/views/omnichannel/directory/CallDialpadButton.tsx b/apps/meteor/client/views/omnichannel/directory/CallDialpadButton.tsx index 4b89e3dbcd35..15ddb34928e5 100644 --- a/apps/meteor/client/views/omnichannel/directory/CallDialpadButton.tsx +++ b/apps/meteor/client/views/omnichannel/directory/CallDialpadButton.tsx @@ -22,7 +22,6 @@ export const CallDialpadButton = ({ phoneNumber }: { phoneNumber: string }): Rea title={outBoundCallsAllowed ? t('Call_number') : t('Call_number_enterprise_only')} disabled={!outBoundCallsEnabledForUser || !phoneNumber} tiny - square icon='phone' onClick={onClick} /> diff --git a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.tsx b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.tsx index d6f759e89cb6..d5b960d9f24a 100644 --- a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.tsx +++ b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.tsx @@ -82,7 +82,7 @@ const NotificationPreferences = ({ options={handleOptions.sound} optionDefault={formValues?.desktopSound} > - + diff --git a/apps/meteor/ee/client/omnichannel/components/CannedResponse/TextEditor/IconButton.tsx b/apps/meteor/ee/client/omnichannel/components/CannedResponse/TextEditor/IconButton.tsx index 38ef16caa46b..d8224eaba844 100644 --- a/apps/meteor/ee/client/omnichannel/components/CannedResponse/TextEditor/IconButton.tsx +++ b/apps/meteor/ee/client/omnichannel/components/CannedResponse/TextEditor/IconButton.tsx @@ -13,7 +13,6 @@ const IconButton = ({ name, action, title }: IconButtonProps): ReactElement => ( size='24px' color='neutral-700' small - square display='flex' justifyContent='center' alignItems='center' diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/users/ContentForDays.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/users/ContentForDays.tsx index 8b0cfb59f812..d843b56aa5b5 100644 --- a/apps/meteor/ee/client/views/admin/engagementDashboard/users/ContentForDays.tsx +++ b/apps/meteor/ee/client/views/admin/engagementDashboard/users/ContentForDays.tsx @@ -43,7 +43,7 @@ const ContentForDays = ({ displacement, onPreviousDateClick, onNextDateClick, ti <> - + @@ -51,7 +51,7 @@ const ContentForDays = ({ displacement, onPreviousDateClick, onNextDateClick, ti - + diff --git a/apps/meteor/ee/client/voip/modal/DialPad/DialInput.tsx b/apps/meteor/ee/client/voip/modal/DialPad/DialInput.tsx index 66b6938caa70..3f40c1160b73 100644 --- a/apps/meteor/ee/client/voip/modal/DialPad/DialInput.tsx +++ b/apps/meteor/ee/client/voip/modal/DialPad/DialInput.tsx @@ -25,7 +25,7 @@ export const DialInput = forwardRef(function DialInput( ref={_ref} textAlign='center' placeholder={t('Phone_number')} - addon={} + addon={} error={inputError} onChange={handleOnChange} name={inputName} diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 738078a3c712..26fdc0fb890b 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -200,7 +200,7 @@ "@rocket.chat/favicon": "workspace:^", "@rocket.chat/forked-matrix-appservice-bridge": "^4.0.1", "@rocket.chat/forked-matrix-bot-sdk": "^0.6.0-beta.2", - "@rocket.chat/fuselage": "^0.32.0-dev.80", + "@rocket.chat/fuselage": "^0.32.0-dev.83", "@rocket.chat/fuselage-hooks": "~0.31.15-dev.6", "@rocket.chat/fuselage-polyfills": "~0.31.15-dev.6", "@rocket.chat/fuselage-toastbar": "^0.32.0-dev.47", diff --git a/yarn.lock b/yarn.lock index bc1ff726a05e..a4f4ba872fe0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3373,16 +3373,16 @@ __metadata: languageName: node linkType: hard -"@rocket.chat/css-in-js@npm:~0.31.15-dev.13": - version: 0.31.15-dev.13 - resolution: "@rocket.chat/css-in-js@npm:0.31.15-dev.13" +"@rocket.chat/css-in-js@npm:~0.31.15-dev.16": + version: 0.31.15-dev.16 + resolution: "@rocket.chat/css-in-js@npm:0.31.15-dev.16" dependencies: "@emotion/hash": ^0.8.0 - "@rocket.chat/css-supports": ~0.31.15-dev.13 - "@rocket.chat/memo": ~0.31.15-dev.13 - "@rocket.chat/stylis-logical-props-middleware": ~0.31.15-dev.13 + "@rocket.chat/css-supports": ~0.31.15-dev.16 + "@rocket.chat/memo": ~0.31.15-dev.16 + "@rocket.chat/stylis-logical-props-middleware": ~0.31.15-dev.16 stylis: ~4.0.13 - checksum: fd184810341c93d638339511b966a3f31a5c047db9d45f288b17fbc0fca16ef40dc17c0255ceab860989a181ea8460641c18ef584138423470dfc38521d72a9e + checksum: 493c97eaafcaa843d1d8317ff49b47efad3ed4df0672be0a3f5362745eec2f82e043bef0bdb5aa91a5dbcbd905d0a46b3d32e1e2aaa21b547b98861a67d22fb2 languageName: node linkType: hard @@ -3421,12 +3421,12 @@ __metadata: languageName: node linkType: hard -"@rocket.chat/css-supports@npm:~0.31.15-dev.13": - version: 0.31.15-dev.13 - resolution: "@rocket.chat/css-supports@npm:0.31.15-dev.13" +"@rocket.chat/css-supports@npm:~0.31.15-dev.16": + version: 0.31.15-dev.16 + resolution: "@rocket.chat/css-supports@npm:0.31.15-dev.16" dependencies: - "@rocket.chat/memo": ~0.31.15-dev.13 - checksum: 66acbc25e38c5f658a7dae49ca8b901dd73b6bcf456bf5081aab1bf6bf6f3a2015d0a58f2e2e37ca447d12d4ebd9b79aae47d12f7bac12a69078e45e4ba35345 + "@rocket.chat/memo": ~0.31.15-dev.16 + checksum: 7c6a1a50a772c42e9995e630e060f7bae38f208b6152c08e5a1767052f8935cc5536c9e9ae68cb5888344b3a7eb61dea0dcc50337c0b377a429dacb3f4e6a42f languageName: node linkType: hard @@ -3671,10 +3671,10 @@ __metadata: languageName: node linkType: hard -"@rocket.chat/fuselage-tokens@npm:~0.32.0-dev.30": - version: 0.32.0-dev.30 - resolution: "@rocket.chat/fuselage-tokens@npm:0.32.0-dev.30" - checksum: bc1852f705a8a33077f218094f39b378928a86f95b6f22161e0832448175671134c03867efc160a9882d0f9e10ba7c2501928e35edee64bb5d570001212d0e0d +"@rocket.chat/fuselage-tokens@npm:~0.32.0-dev.33": + version: 0.32.0-dev.33 + resolution: "@rocket.chat/fuselage-tokens@npm:0.32.0-dev.33" + checksum: 3c11a6945c2951776ea2d270a9e3d019d8c06a511a902d739e99c73b90b57faa4ad367cabdeccafbfb3fa92d5fd09df86c9158a15d58cc1c60945c20718ee810 languageName: node linkType: hard @@ -3718,15 +3718,15 @@ __metadata: languageName: node linkType: hard -"@rocket.chat/fuselage@npm:^0.32.0-dev.80": - version: 0.32.0-dev.80 - resolution: "@rocket.chat/fuselage@npm:0.32.0-dev.80" +"@rocket.chat/fuselage@npm:^0.32.0-dev.83": + version: 0.32.0-dev.83 + resolution: "@rocket.chat/fuselage@npm:0.32.0-dev.83" dependencies: - "@rocket.chat/css-in-js": ~0.31.15-dev.13 - "@rocket.chat/css-supports": ~0.31.15-dev.13 - "@rocket.chat/fuselage-tokens": ~0.32.0-dev.30 - "@rocket.chat/memo": ~0.31.15-dev.13 - "@rocket.chat/styled": ~0.31.15-dev.13 + "@rocket.chat/css-in-js": ~0.31.15-dev.16 + "@rocket.chat/css-supports": ~0.31.15-dev.16 + "@rocket.chat/fuselage-tokens": ~0.32.0-dev.33 + "@rocket.chat/memo": ~0.31.15-dev.16 + "@rocket.chat/styled": ~0.31.15-dev.16 invariant: ^2.2.4 react-keyed-flatten-children: ^1.3.0 peerDependencies: @@ -3736,7 +3736,7 @@ __metadata: react: ^17.0.2 react-dom: ^17.0.2 react-virtuoso: 1.2.4 - checksum: 4d5faff19704b3665cd7d4c5c621fdbe3b021e2d17de695ce5ba92b76a1f1c205025560249ad018bdfadfaf26663e29b571603a782467138c7af8b19fbecb4f2 + checksum: b9d7c7fd11f9653950542b25dcad93bdb2077f6bac1ea03c3b2497ef43e32b994904cb46d36122966fa3151b704e8829a3adc5722a594c862f72c7962735353a languageName: node linkType: hard @@ -3953,10 +3953,10 @@ __metadata: languageName: node linkType: hard -"@rocket.chat/memo@npm:~0.31.15-dev.13": - version: 0.31.15-dev.13 - resolution: "@rocket.chat/memo@npm:0.31.15-dev.13" - checksum: 41a5a8006ea9356e1a3cf83d73649d797c6d48f3373be31a1dd1c9e3a0ba05a6101d8462e0e22cc47c0d116b439c7ba3d2f03a3d4b12d9bbd7fd0cc9879f77da +"@rocket.chat/memo@npm:~0.31.15-dev.16": + version: 0.31.15-dev.16 + resolution: "@rocket.chat/memo@npm:0.31.15-dev.16" + checksum: b9902dcc072d9cb6f1ed9132e2fd51f537b47f5bc985d77b4c792fd1de23c60caea4f55ed685e1fea4dd3e32bbeb911029bb01617cccee18949271b0f9ea329f languageName: node linkType: hard @@ -4019,7 +4019,7 @@ __metadata: "@rocket.chat/favicon": "workspace:^" "@rocket.chat/forked-matrix-appservice-bridge": ^4.0.1 "@rocket.chat/forked-matrix-bot-sdk": ^0.6.0-beta.2 - "@rocket.chat/fuselage": ^0.32.0-dev.80 + "@rocket.chat/fuselage": ^0.32.0-dev.83 "@rocket.chat/fuselage-hooks": ~0.31.15-dev.6 "@rocket.chat/fuselage-polyfills": ~0.31.15-dev.6 "@rocket.chat/fuselage-toastbar": ^0.32.0-dev.47 @@ -4435,13 +4435,13 @@ __metadata: languageName: node linkType: hard -"@rocket.chat/styled@npm:~0.31.15-dev.13": - version: 0.31.15-dev.13 - resolution: "@rocket.chat/styled@npm:0.31.15-dev.13" +"@rocket.chat/styled@npm:~0.31.15-dev.16": + version: 0.31.15-dev.16 + resolution: "@rocket.chat/styled@npm:0.31.15-dev.16" dependencies: - "@rocket.chat/css-in-js": ~0.31.15-dev.13 + "@rocket.chat/css-in-js": ~0.31.15-dev.16 tslib: ^2.3.1 - checksum: 08ed3e23a24a4d88da403bfd7ee2eb1f0f749300ffde972410676b2eff6eebd39a77a786b6394d51b0461aae40a1990779cf6b682b47bc3899319d12afbe46e4 + checksum: 744b50305bf277ff4ecbf790c9216f9db9b0f7024d007431c67d3a8fc9ce09822c46b2ea4dd2b1696a5cc4584eb9bdb600e8f5ab74a09b8621b0692e874e36f4 languageName: node linkType: hard @@ -4477,15 +4477,15 @@ __metadata: languageName: node linkType: hard -"@rocket.chat/stylis-logical-props-middleware@npm:~0.31.15-dev.13": - version: 0.31.15-dev.13 - resolution: "@rocket.chat/stylis-logical-props-middleware@npm:0.31.15-dev.13" +"@rocket.chat/stylis-logical-props-middleware@npm:~0.31.15-dev.16": + version: 0.31.15-dev.16 + resolution: "@rocket.chat/stylis-logical-props-middleware@npm:0.31.15-dev.16" dependencies: - "@rocket.chat/css-supports": ~0.31.15-dev.13 + "@rocket.chat/css-supports": ~0.31.15-dev.16 tslib: ^2.3.1 peerDependencies: stylis: 4.0.10 - checksum: 8991b675eb18c18e46926deab8b1a684bb8b5f6a4bfc3e71222815fc2842c24182c4cdc970850b6213d79daa1816026d09703c3c14365762de40c0ef179cab1e + checksum: 5879adda3823e5feea786184a131e1595be3eb6696edb915cf38db21698b2660a44e69eba2f2d530a32c06b483e3352da353d6fa1251fe4e87cb12c51c9dc2a1 languageName: node linkType: hard