From 649aa72ddfc20a92410a9383cb53bb3395a5b823 Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso.evangelista@rocket.chat>
Date: Mon, 5 Dec 2022 22:09:02 -0300
Subject: [PATCH] Chore: Update ESlint rules of client code (#27427)

Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>
---
 apps/meteor/.storybook/decorators.tsx         |   5 +-
 apps/meteor/client/.eslintrc.json             | 185 ++++++------------
 .../UIKit/hooks/useUIKitHandleAction.tsx      |   2 +-
 .../UIKit/hooks/useUIKitHandleClose.tsx       |   4 +-
 .../UIKit/hooks/useUIKitStateManager.tsx      |   3 +-
 .../AdministrationList/AdministrationList.tsx |   6 +-
 .../AdministrationModelList.tsx               |   5 +-
 .../AdministrationList/AppsModelList.tsx      |   5 +-
 .../AdministrationList/AuditModelList.tsx     |   3 +-
 .../client/components/AutoCompleteAgent.tsx   |   3 +-
 .../AutoCompleteAgentWithoutExtension.tsx     |   5 +-
 .../components/AutoCompleteDepartment.tsx     |   3 +-
 apps/meteor/client/components/Backdrop.tsx    |   3 +-
 .../BurgerMenu/BurgerBadge.stories.tsx        |   5 +-
 .../components/BurgerMenu/BurgerBadge.tsx     |   3 +-
 .../BurgerMenu/BurgerIcon.stories.tsx         |   2 +-
 .../components/BurgerMenu/BurgerIcon.tsx      |   3 +-
 .../components/BurgerMenu/BurgerMenu.tsx      |   3 +-
 .../BurgerMenu/BurgerMenuButton.stories.tsx   |   2 +-
 .../BurgerMenu/BurgerMenuButton.tsx           |   3 +-
 .../client/components/BurgerMenu/Line.tsx     |   3 +-
 .../client/components/BurgerMenu/Wrapper.tsx  |   3 +-
 .../components/ConfirmOwnerChangeModal.tsx    |   3 +-
 .../CreateDiscussion/CreateDiscussion.tsx     |   3 +-
 .../DefaultParentRoomField.tsx                |   3 +-
 apps/meteor/client/components/Emoji.tsx       |   3 +-
 .../meteor/client/components/FilterByText.tsx |   3 +-
 .../components/GenericModal.stories.tsx       |   2 +-
 .../meteor/client/components/GenericModal.tsx |   9 +-
 .../GenericTable/GenericTable.stories.tsx     |   2 +-
 .../components/GenericTable/GenericTable.tsx  |   8 +-
 .../components/GenericTable/HeaderCell.tsx    |   3 +-
 .../components/GenericTable/NoResults.tsx     |   3 +-
 .../components/GenericTable/SortIcon.tsx      |   3 +-
 .../GenericTable/V2/GenericTable.tsx          |   3 +-
 .../GenericTable/V2/GenericTableBody.tsx      |   3 +-
 .../GenericTable/V2/GenericTableCell.tsx      |   3 +-
 .../GenericTable/V2/GenericTableHeader.tsx    |   3 +-
 .../V2/GenericTableHeaderCell.tsx             |   3 +-
 .../V2/GenericTableLoadingRow.tsx             |   3 +-
 .../V2/GenericTableLoadingTable.tsx           |   3 +-
 .../GenericTable/V2/GenericTableRow.tsx       |   3 +-
 .../hooks/useShowingResultsLabel.ts           |   5 +-
 .../InfoPanel/InfoPanel.stories.tsx           |   2 +-
 .../client/components/InfoPanel/InfoPanel.tsx |   3 +-
 .../components/InfoPanel/InfoPanelAction.tsx  |   3 +-
 .../InfoPanel/InfoPanelActionGroup.tsx        |   3 +-
 .../components/InfoPanel/InfoPanelAvatar.tsx  |   3 +-
 .../components/InfoPanel/InfoPanelField.tsx   |   3 +-
 .../components/InfoPanel/InfoPanelLabel.tsx   |   3 +-
 .../components/InfoPanel/InfoPanelSection.tsx |   3 +-
 .../components/InfoPanel/InfoPanelText.tsx    |   3 +-
 .../components/InfoPanel/InfoPanelTitle.tsx   |   3 +-
 .../InfoPanel/RetentionPolicyCallout.tsx      |   3 +-
 apps/meteor/client/components/LocalTime.tsx   |   3 +-
 .../components/MarkdownText.stories.tsx       |   2 +-
 .../meteor/client/components/MarkdownText.tsx |   3 +-
 .../components/Omnichannel/Skeleton.tsx       |   3 +-
 .../client/components/Omnichannel/Tags.tsx    |   3 +-
 .../Omnichannel/modals/CloseChatModal.tsx     |   5 +-
 .../Omnichannel/modals/CloseChatModalData.tsx |   5 +-
 .../Omnichannel/modals/ForwardChatModal.tsx   |   5 +-
 .../modals/ModalSeparator/ModalSeparator.tsx  |   3 +-
 .../modals/ReturnChatQueueModal.tsx           |   3 +-
 .../Omnichannel/modals/TranscriptModal.tsx    |   3 +-
 .../client/components/Page/Page.stories.tsx   |   2 +-
 apps/meteor/client/components/Page/Page.tsx   |   3 +-
 .../components/Page/PageBlockWithBorder.tsx   |   5 +-
 .../client/components/Page/PageContent.tsx    |   3 +-
 .../client/components/Page/PageContext.ts     |   3 +-
 .../client/components/Page/PageHeader.tsx     |   3 +-
 .../components/Page/PageScrollableContent.tsx |   9 +-
 .../Page/PageScrollableContentWithShadow.tsx  |   3 +-
 .../meteor/client/components/PageSkeleton.tsx |   3 +-
 apps/meteor/client/components/PlanTag.tsx     |   3 +-
 apps/meteor/client/components/RawText.tsx     |   3 +-
 .../components/RoomAutoComplete/Avatar.tsx    |   3 +-
 .../RoomAutoComplete/RoomAutoComplete.tsx     |   3 +-
 .../OmnichannelAppSourceRoomIcon.tsx          |   3 +-
 .../OmnichannelCoreSourceRoomIcon.tsx         |   3 +-
 .../OmnichannelRoomIcon.tsx                   |   8 +-
 .../context/OmnichannelRoomIconContext.tsx    |   2 +-
 .../provider/OmnichannelRoomIconProvider.tsx  |   5 +-
 .../client/components/RoomIcon/RoomIcon.tsx   |   6 +-
 .../components/ScrollableContentWrapper.tsx   |   6 +-
 .../client/components/Sidebar/Content.tsx     |   3 +-
 .../client/components/Sidebar/Header.tsx      |   3 +-
 .../client/components/Sidebar/ListItem.tsx    |   3 +-
 .../client/components/Sidebar/Sidebar.tsx     |   3 +-
 .../components/Sidebar/SidebarGenericItem.tsx |   3 +-
 .../Sidebar/SidebarItemsAssembler.tsx         |   5 +-
 .../Sidebar/SidebarNavigationItem.tsx         |   6 +-
 apps/meteor/client/components/Skeleton.tsx    |   3 +-
 .../components/SortList/GroupingList.tsx      |   3 +-
 .../client/components/SortList/SortList.tsx   |   3 +-
 .../components/SortList/SortModeList.tsx      |   3 +-
 .../components/SortList/ViewModeList.tsx      |   3 +-
 apps/meteor/client/components/Subtitle.tsx    |   3 +-
 apps/meteor/client/components/TextCopy.tsx    |   3 +-
 .../client/components/TooltipPortal.tsx       |   3 +-
 .../TwoFactorModal/TwoFactorEmailModal.tsx    |   6 +-
 .../TwoFactorModal/TwoFactorModal.tsx         |   3 +-
 .../TwoFactorModal/TwoFactorPasswordModal.tsx |   6 +-
 .../TwoFactorModal/TwoFactorTotpModal.tsx     |   6 +-
 apps/meteor/client/components/UTCClock.tsx    |   3 +-
 .../client/components/UrlChangeModal.tsx      |   3 +-
 .../UserAutoComplete.stories.tsx              |   2 +-
 .../UserAutoComplete/UserAutoComplete.tsx     |   3 +-
 .../UserAutoCompleteMultiple.tsx              |   3 +-
 .../UserAutoCompleteMultipleFederated.tsx     |   3 +-
 .../UserAutoCompleteMultipleOption.tsx        |   5 +-
 .../UserAutoCompleteMultipleOptions.tsx       |   6 +-
 .../components/UserCard/UserCard.stories.tsx  |   2 +-
 .../client/components/UserCard/UserCard.tsx   |   3 +-
 .../components/UserCard/UserCardAction.tsx    |   3 +-
 .../components/UserCard/UserCardContainer.tsx |   3 +-
 .../components/UserCard/UserCardInfo.tsx      |   3 +-
 .../components/UserCard/UserCardRole.tsx      |   3 +-
 .../components/UserCard/UserCardRoles.tsx     |   3 +-
 .../components/UserCard/UserCardUsername.tsx  |   3 +-
 .../components/UserInfo/UserInfo.stories.tsx  |   2 +-
 .../client/components/UserInfo/UserInfo.tsx   |   8 +-
 .../components/UserInfo/UserInfoAction.tsx    |   3 +-
 .../components/UserInfo/UserInfoAvatar.tsx    |   3 +-
 .../components/UserInfo/UserInfoUsername.tsx  |  11 +-
 .../UserStatus/ReactiveUserStatus.tsx         |   3 +-
 .../client/components/UserStatusMenu.tsx      |   3 +-
 .../components/VerticalBar/VerticalBar.tsx    |   3 +-
 .../VerticalBar/VerticalBarAction.tsx         |   6 +-
 .../VerticalBar/VerticalBarActions.tsx        |   3 +-
 .../VerticalBar/VerticalBarBack.tsx           |   3 +-
 .../VerticalBar/VerticalBarButton.tsx         |   3 +-
 .../VerticalBar/VerticalBarClose.tsx          |   3 +-
 .../VerticalBar/VerticalBarContent.tsx        |   3 +-
 .../VerticalBar/VerticalBarFooter.tsx         |   3 +-
 .../VerticalBar/VerticalBarHeader.tsx         |   3 +-
 .../VerticalBar/VerticalBarIcon.tsx           |   3 +-
 .../VerticalBar/VerticalBarInnerContent.tsx   |   3 +-
 .../VerticalBarScrollableContent.tsx          |   3 +-
 .../VerticalBar/VerticalBarSkeleton.tsx       |   3 +-
 .../VerticalBar/VerticalBarText.tsx           |   3 +-
 .../meteor/client/components/WarningModal.tsx |   3 +-
 .../client/components/avatar/AppAvatar.tsx    |   3 +-
 .../client/components/avatar/BaseAvatar.tsx   |   6 +-
 .../client/components/avatar/RoomAvatar.tsx   |   3 +-
 .../components/avatar/RoomAvatarEditor.tsx    |   5 +-
 .../client/components/avatar/UserAvatar.tsx   |   6 +-
 .../UserAvatarEditor/UserAvatarEditor.tsx     |   5 +-
 .../ConnectionStatusBar.stories.tsx           |   5 +-
 .../connectionStatus/ConnectionStatusBar.tsx  |   3 +-
 .../components/dataView/Counter.stories.tsx   |   2 +-
 .../client/components/dataView/Counter.tsx    |   3 +-
 .../dataView/CounterSet.stories.tsx           |   2 +-
 .../client/components/dataView/CounterSet.tsx |   3 +-
 .../components/dataView/Growth.stories.tsx    |   2 +-
 .../client/components/dataView/Growth.tsx     |   3 +-
 .../dataView/NegativeGrowthSymbol.stories.tsx |   2 +-
 .../dataView/NegativeGrowthSymbol.tsx         |   3 +-
 .../dataView/PositiveGrowthSymbol.stories.tsx |   2 +-
 .../dataView/PositiveGrowthSymbol.tsx         |   3 +-
 .../Attachments/ActionAttachmentButton.tsx    |   8 +-
 .../message/Attachments/ActionAttachtment.tsx |   5 +-
 .../Attachments/Attachment/Attachment.tsx     |   3 +-
 .../Attachment/AttachmentAction.tsx           |   3 +-
 .../Attachment/AttachmentAuthor.tsx           |   3 +-
 .../Attachment/AttachmentAuthorAvatar.tsx     |   3 +-
 .../Attachment/AttachmentAuthorName.tsx       |   3 +-
 .../Attachment/AttachmentBlock.tsx            |   3 +-
 .../Attachment/AttachmentCollapse.tsx         |   3 +-
 .../Attachment/AttachmentContent.tsx          |   3 +-
 .../Attachment/AttachmentDescription.tsx      |   3 +-
 .../Attachment/AttachmentDetails.tsx          |   3 +-
 .../Attachment/AttachmentDownload.tsx         |   3 +-
 .../Attachment/AttachmentInner.tsx            |   3 +-
 .../Attachments/Attachment/AttachmentRow.tsx  |   3 +-
 .../Attachments/Attachment/AttachmentSize.tsx |   5 +-
 .../Attachments/Attachment/AttachmentText.tsx |   3 +-
 .../Attachment/AttachmentThumb.tsx            |   3 +-
 .../Attachment/AttachmentTitle.tsx            |   3 +-
 .../Attachment/AttachmentTitleLink.tsx        |   3 +-
 .../Attachments/Attachments.stories.tsx       |   4 +-
 .../message/Attachments/Attachments.tsx       |   5 +-
 .../message/Attachments/DefaultAttachment.tsx |   6 +-
 .../Attachments/FieldsAttachment/Field.tsx    |   3 +-
 .../FieldsAttachment/ShortField.tsx           |   3 +-
 .../Attachments/FieldsAttachment/index.tsx    |   3 +-
 .../Attachments/Files/AudioAttachment.tsx     |   5 +-
 .../Files/GenericFileAttachment.tsx           |   5 +-
 .../Attachments/Files/ImageAttachment.tsx     |   5 +-
 .../Attachments/Files/VideoAttachment.tsx     |   5 +-
 .../message/Attachments/Files/index.tsx       |   6 +-
 .../components/message/Attachments/Item.tsx   |   6 +-
 .../message/Attachments/QuoteAttachment.tsx   |   5 +-
 .../message/Attachments/components/Image.tsx  |   5 +-
 .../Attachments/components/ImageBox.tsx       |   3 +-
 .../message/Attachments/components/Load.tsx   |   3 +-
 .../Attachments/components/Retry.stories.tsx  |   2 +-
 .../message/Attachments/components/Retry.tsx  |   3 +-
 .../providers/AttachmentProvider.tsx          |   6 +-
 .../message/MessageActions/Action.tsx         |   9 +-
 .../message/MessageActions/Actions.tsx        |   8 +-
 .../components/message/Metrics/Broadcast.tsx  |   3 +-
 .../components/message/Metrics/Content.tsx    |   3 +-
 .../message/Metrics/ContentItem.tsx           |   3 +-
 .../components/message/Metrics/Discussion.tsx |   3 +-
 .../components/message/Metrics/Metrics.tsx    |   3 +-
 .../message/Metrics/MetricsFollowing.tsx      |   3 +-
 .../message/Metrics/MetricsItem.tsx           |   3 +-
 .../message/Metrics/MetricsItemIcon.tsx       |   3 +-
 .../message/Metrics/MetricsItemLabel.tsx      |   3 +-
 .../components/message/Metrics/Reply.tsx      |   3 +-
 .../components/message/Metrics/Thread.tsx     |   3 +-
 .../message/NotificationStatus/All.tsx        |   3 +-
 .../message/NotificationStatus/Me.tsx         |   3 +-
 .../NotificationStatus/NotificationStatus.tsx |   6 +-
 .../message/NotificationStatus/Unread.tsx     |   3 +-
 .../message/hooks/useBlockRendered.ts         |   3 +-
 .../client/components/modal/ModalBackdrop.tsx |   3 +-
 .../client/components/modal/ModalPortal.tsx   |   3 +-
 .../client/components/root/ErrorBoundary.tsx  |   3 +-
 .../components/voip/room/VoipRoomForeword.tsx |   3 +-
 .../client/components/withDoNotAskAgain.tsx   |   5 +-
 apps/meteor/client/contexts/CallContext.ts    |   7 +-
 .../client/contexts/VideoConfContext.ts       |   7 +-
 .../definitions/SubscriptionWithRoom.ts       |   2 +-
 .../client/hooks/lists/useRecordList.ts       |   4 +-
 .../hooks/lists/useScrollableMessageList.ts   |   7 +-
 .../hooks/lists/useScrollableRecordList.ts    |   2 +-
 .../lists/useStreamUpdatesForMessageList.ts   |   5 +-
 .../hooks/omnichannel/useOmnichannel.ts       |   3 +-
 .../client/hooks/useClipboardWithToast.ts     |   3 +-
 .../client/hooks/useDecryptedMessage.ts       |   3 +-
 apps/meteor/client/hooks/useEndpointAction.ts |   2 +-
 .../hooks/useEndpointActionExperimental.ts    |   2 +-
 apps/meteor/client/hooks/useEndpointData.ts   |   5 +-
 apps/meteor/client/hooks/useEndpointUpload.ts |   3 +-
 apps/meteor/client/hooks/useForm.ts           |   3 +-
 .../client/hooks/useFormatDateAndTime.ts      |   3 +-
 apps/meteor/client/hooks/useIsEnterprise.ts   |   5 +-
 apps/meteor/client/hooks/useLicense.ts        |   5 +-
 apps/meteor/client/hooks/usePresence.ts       |   5 +-
 .../client/hooks/usePreventPropagation.ts     |   2 +-
 apps/meteor/client/hooks/useReactiveQuery.ts  |   5 +-
 apps/meteor/client/hooks/useReactiveVar.ts    |   2 +-
 .../client/hooks/useRegistrationStatus.ts     |   5 +-
 apps/meteor/client/hooks/useRoomIcon.tsx      |   5 +-
 .../client/hooks/useRoomInfoEndpoint.ts       |   7 +-
 apps/meteor/client/hooks/useUpdateAvatar.ts   |   2 +-
 apps/meteor/client/hooks/useUserData.ts       |   3 +-
 apps/meteor/client/lib/RoomManager.ts         |   2 +-
 apps/meteor/client/lib/appLayout.ts           |   2 +-
 .../client/lib/asyncState/AsyncState.ts       |   2 +-
 .../meteor/client/lib/asyncState/functions.ts |   2 +-
 apps/meteor/client/lib/banners.ts             |   6 +-
 apps/meteor/client/lib/chats/ChatAPI.ts       |   4 +-
 apps/meteor/client/lib/chats/data.ts          |   2 +-
 .../lib/chats/flows/processMessageEditing.ts  |   4 +-
 .../lib/chats/flows/processSetReaction.ts     |   4 +-
 .../lib/chats/flows/processTooLongMessage.ts  |   4 +-
 .../lib/chats/flows/requestMessageDeletion.ts |   4 +-
 .../client/lib/chats/flows/sendMessage.ts     |   4 +-
 .../client/lib/chats/flows/uploadFiles.ts     |   2 +-
 apps/meteor/client/lib/chats/uploads.ts       |   4 +-
 apps/meteor/client/lib/createRouteGroup.tsx   |   6 +-
 apps/meteor/client/lib/createSidebarItems.ts  |   2 +-
 apps/meteor/client/lib/getWebdavServerName.ts |   2 +-
 apps/meteor/client/lib/imperativeModal.ts     |   2 +-
 apps/meteor/client/lib/minimongo/query.ts     |   2 +-
 apps/meteor/client/lib/minimongo/sort.ts      |   2 +-
 .../client/lib/portals/createLazyElement.ts   |   3 +-
 .../client/lib/portals/createLazyPortal.ts    |   2 +-
 apps/meteor/client/lib/presence.ts            |   3 +-
 .../client/lib/rooms/roomCoordinator.ts       |  10 +-
 .../client/lib/rooms/roomTypes/private.ts     |   3 +-
 .../client/lib/rooms/roomTypes/public.ts      |   3 +-
 .../meteor/client/lib/rooms/roomTypes/voip.ts |   2 +-
 apps/meteor/client/lib/userData.ts            |   3 +-
 apps/meteor/client/lib/utils/call.ts          |   2 +-
 .../client/lib/utils/callWithErrorHandling.ts |   2 +-
 .../client/lib/utils/canDeleteMessage.ts      |   3 +-
 apps/meteor/client/lib/utils/formatDate.ts    |   3 +-
 .../client/lib/utils/formatDateAndTime.ts     |   3 +-
 apps/meteor/client/lib/utils/formatTime.ts    |   3 +-
 .../client/lib/utils/mapMessageFromApi.ts     |   3 +-
 apps/meteor/client/lib/utils/messageArgs.ts   |   2 +-
 apps/meteor/client/lib/utils/timeAgo.ts       |   3 +-
 apps/meteor/client/lib/voip/Helper.ts         |   2 +-
 apps/meteor/client/lib/voip/LocalStream.ts    |   5 +-
 .../meteor/client/lib/voip/QueueAggregator.ts |   3 +-
 apps/meteor/client/lib/voip/VoIPUser.ts       |  26 +--
 apps/meteor/client/methods/updateMessage.ts   |   2 +-
 .../client/portals/VideoConfPopupPortal.ts    |   3 +-
 .../providers/AuthorizationProvider.tsx       |   5 +-
 .../client/providers/AvatarUrlProvider.tsx    |   3 +-
 .../providers/CallProvider/CallProvider.tsx   |  25 +--
 .../CallProvider/hooks/useWebRtcServers.ts    |   2 +-
 .../lib/parseStringToIceServers.ts            |   2 +-
 .../providers/ConnectionStatusProvider.tsx    |   6 +-
 .../client/providers/CustomSoundProvider.tsx  |   3 +-
 .../DeviceProvider/DeviceProvider.tsx         |   6 +-
 .../lib/isSetSinkIdAvailable.tsx              |   2 +-
 .../client/providers/LayoutProvider.tsx       |   3 +-
 .../client/providers/MeteorProvider.tsx       |   3 +-
 .../meteor/client/providers/ModalProvider.tsx |   3 +-
 .../client/providers/OmnichannelProvider.tsx  |   9 +-
 .../client/providers/RouterProvider.tsx       |   6 +-
 .../client/providers/ServerProvider.tsx       |   8 +-
 .../client/providers/SessionProvider.tsx      |   3 +-
 .../client/providers/SettingsProvider.tsx     |   6 +-
 .../providers/ToastMessagesProvider.tsx       |   3 +-
 .../client/providers/TooltipProvider.tsx      |   3 +-
 .../client/providers/TranslationProvider.tsx  |  10 +-
 apps/meteor/client/providers/UserProvider.tsx |   6 +-
 .../client/providers/VideoConfProvider.tsx    |  13 +-
 .../client/sidebar/Item/Condensed.stories.tsx |   2 +-
 apps/meteor/client/sidebar/Item/Condensed.tsx |   6 +-
 .../client/sidebar/Item/Extended.stories.tsx  |   2 +-
 apps/meteor/client/sidebar/Item/Extended.tsx  |   6 +-
 .../client/sidebar/Item/Medium.stories.tsx    |   2 +-
 apps/meteor/client/sidebar/Item/Medium.tsx    |   3 +-
 .../client/sidebar/RoomList/RoomList.tsx      |   5 +-
 .../client/sidebar/RoomList/RoomListRow.tsx   |  11 +-
 .../RoomList/ScrollerWithCustomProps.tsx      |   3 +-
 .../RoomList/SideBarItemTemplateWithData.tsx  |  18 +-
 .../RoomList/normalizeSidebarMessage.ts       |   4 +-
 apps/meteor/client/sidebar/RoomMenu.tsx       |   8 +-
 .../meteor/client/sidebar/Sidebar.stories.tsx |   8 +-
 .../client/sidebar/footer/SidebarFooter.tsx   |   3 +-
 .../sidebar/footer/SidebarFooterDefault.tsx   |   3 +-
 .../footer/voip/VoipFooter.stories.tsx        |   4 +-
 .../client/sidebar/footer/voip/VoipFooter.tsx |   9 +-
 .../voip/hooks/useOmnichannelContactLabel.ts  |   2 +-
 .../client/sidebar/footer/voip/index.tsx      |   3 +-
 .../client/sidebar/header/CreateChannel.tsx   |   6 +-
 .../sidebar/header/CreateChannelWithData.tsx  |   8 +-
 .../sidebar/header/CreateDirectMessage.tsx    |   3 +-
 .../header/CreateTeam/CreateTeamModal.tsx     |   3 +-
 .../client/sidebar/header/EditStatusModal.tsx |   3 +-
 .../sidebar/header/UserAvatarButton.tsx       |   3 +-
 .../client/sidebar/header/UserDropdown.tsx    |   7 +-
 .../sidebar/header/actions/Administration.tsx |   3 +-
 .../sidebar/header/actions/CreateRoom.tsx     |   3 +-
 .../sidebar/header/actions/CreateRoomList.tsx |   3 +-
 .../sidebar/header/actions/Directory.tsx      |   3 +-
 .../client/sidebar/header/actions/Home.tsx    |   3 +-
 .../client/sidebar/header/actions/Login.tsx   |   3 +-
 .../client/sidebar/header/actions/Search.tsx  |   3 +-
 .../client/sidebar/header/actions/Sort.tsx    |   3 +-
 .../header/hooks/useCreateRoomModal.tsx       |   3 +-
 .../header/hooks/useDropdownVisibility.ts     |   3 +-
 apps/meteor/client/sidebar/header/index.tsx   |   3 +-
 .../sidebar/hooks/useAvatarTemplate.tsx       |   3 +-
 .../client/sidebar/hooks/usePreventDefault.ts |   3 +-
 .../sidebar/hooks/useShortcutOpenMenu.ts      |   3 +-
 .../sidebar/hooks/useTemplateByViewMode.tsx   |   3 +-
 apps/meteor/client/sidebar/search/Row.tsx     |   5 +-
 .../search/ScrollerWithCustomProps.tsx        |   3 +-
 .../client/sidebar/search/SearchList.tsx      |  24 +--
 .../meteor/client/sidebar/search/UserItem.tsx |   5 +-
 .../sidebar/sections/OmnichannelSection.tsx   |   6 +-
 .../actions/OmnichannelCallDialPad.tsx        |   3 +-
 .../actions/OmnichannelCallToggle.tsx         |   3 +-
 .../actions/OmnichannelCallToggleError.tsx    |   3 +-
 .../actions/OmnichannelCallToggleLoading.tsx  |   3 +-
 .../actions/OmnichannelCallToggleReady.tsx    |   3 +-
 .../actions/OmnichannelLivechatToggle.tsx     |   3 +-
 .../client/sidebar/sections/actions/index.ts  |   1 -
 .../startup/contextualBar/exportMessages.ts   |   3 +-
 .../client/startup/enterRoom/readMessages.ts  |   2 +-
 .../meteor/client/startup/incomingMessages.ts |   2 +-
 .../client/startup/loadMissedMessages.ts      |   2 +-
 .../startup/mergeSubscriptionsAndRooms.ts     |   6 +-
 apps/meteor/client/startup/otr.ts             |   2 +-
 apps/meteor/client/startup/startup.ts         |   2 +-
 .../client/startup/userStatusManuallySet.ts   |   2 +-
 .../stories/contexts/ModalContextMock.tsx     |   3 +-
 .../contexts/QueryClientProviderMock.tsx      |   3 +-
 .../stories/contexts/RouterContextMock.tsx    |   3 +-
 .../stories/contexts/ServerContextMock.tsx    |   8 +-
 .../contexts/TranslationContextMock.tsx       |   6 +-
 apps/meteor/client/templates.ts               |   2 +-
 .../client/views/account/AccountRouter.tsx    |   3 +-
 .../client/views/account/AccountSidebar.tsx   |   3 +-
 .../integrations/AccountIntegrationsPage.tsx  |   6 +-
 .../integrations/AccountIntegrationsRoute.tsx |   3 +-
 .../preferences/AccountPreferencesPage.tsx    |   3 +-
 .../views/account/preferences/MyDataModal.tsx |   3 +-
 .../preferences/PreferencesGlobalSection.tsx  |   8 +-
 .../PreferencesHighlightsSection.tsx          |   5 +-
 .../PreferencesLocalizationSection.tsx        |   6 +-
 .../PreferencesMessagesSection.tsx            |   6 +-
 .../preferences/PreferencesMyDataSection.tsx  |   3 +-
 .../PreferencesNotificationsSection.tsx       |   9 +-
 .../preferences/PreferencesSoundSection.tsx   |   8 +-
 .../PreferencesUserPresenceSection.tsx        |   3 +-
 .../account/profile/AccountProfileForm.tsx    |  10 +-
 .../account/profile/AccountProfilePage.tsx    |   7 +-
 .../account/profile/AccountProfileRoute.tsx   |   3 +-
 .../account/profile/ActionConfirmModal.tsx    |   3 +-
 .../account/security/AccountSecurityPage.tsx  |   3 +-
 .../account/security/AccountSecurityRoute.tsx |   3 +-
 .../account/security/BackupCodesModal.tsx     |   3 +-
 .../views/account/security/EndToEnd.tsx       |   3 +-
 .../views/account/security/TwoFactorEmail.tsx |   3 +-
 .../views/account/security/TwoFactorTOTP.tsx  |   3 +-
 .../account/tokens/AccountTokensPage.tsx      |   3 +-
 .../account/tokens/AccountTokensRoute.tsx     |   3 +-
 .../AccountTokensTable/AccountTokensRow.tsx   |   5 +-
 .../AccountTokensTable/AccountTokensTable.tsx |   3 +-
 .../tokens/AccountTokensTable/AddToken.tsx    |   3 +-
 .../views/admin/AdministrationLayout.tsx      |   3 +-
 .../views/admin/AdministrationRouter.tsx      |   3 +-
 .../views/admin/EditableSettingsContext.ts    |   4 +-
 .../views/admin/apps/AccordionLoading.tsx     |   3 +-
 .../apps/AppDetailsPage/AppDetailsPage.tsx    |   9 +-
 .../AppDetailsPage/AppDetailsPageHeader.tsx   |   3 +-
 .../AppDetailsPage/AppDetailsPageLoading.tsx  |   3 +-
 .../tabs/AppDetails/AppDetails.tsx            |   8 +-
 .../tabs/AppDetails/AppDetailsAPIs.tsx        |   5 +-
 .../AppDetailsPage/tabs/AppLogs/AppLogs.tsx   |   3 +-
 .../tabs/AppLogs/AppLogsItem.tsx              |   5 +-
 .../tabs/AppLogs/AppLogsItemEntry.tsx         |   3 +-
 .../tabs/AppReleases/AppReleases.tsx          |   5 +-
 .../tabs/AppReleases/AppReleasesItem.tsx      |   3 +-
 .../apps/AppDetailsPage/tabs/AppSecurity.tsx  |   5 +-
 .../tabs/AppSettings/AppSetting.tsx           |   7 +-
 .../tabs/AppSettings/AppSettings.tsx          |   9 +-
 .../tabs/AppSettings/AppSettingsAssembler.tsx |   7 +-
 .../tabs/AppStatus/AppStatus.tsx              |   6 +-
 .../tabs/AppStatus/AppStatusPriceDisplay.tsx  |   6 +-
 .../admin/apps/AppPermissionsReviewModal.tsx  |   3 +-
 .../views/admin/apps/AppUpdateModal.tsx       |   3 +-
 .../client/views/admin/apps/AppsContext.tsx   |   5 +-
 .../views/admin/apps/AppsList/AppRow.tsx      |   3 +-
 .../views/admin/apps/AppsList/AppsList.tsx    |   5 +-
 .../views/admin/apps/AppsPage/AppsFilters.tsx |   7 +-
 .../views/admin/apps/AppsPage/AppsPage.tsx    |   3 +-
 .../apps/AppsPage/AppsPageConnectionError.tsx |   3 +-
 .../admin/apps/AppsPage/AppsPageContent.tsx   |   5 +-
 .../apps/AppsPage/AppsPageContentSkeleton.tsx |   3 +-
 .../apps/AppsPage/FeaturedAppsSections.tsx    |   5 +-
 .../NoInstalledAppMatchesEmptyState.tsx       |   3 +-
 .../NoInstalledAppsFoundEmptyState.tsx        |   3 +-
 ...etplaceOrInstalledAppMatchesEmptyState.tsx |   3 +-
 .../client/views/admin/apps/AppsProvider.tsx  |  10 +-
 .../client/views/admin/apps/AppsRoute.tsx     |   3 +-
 .../client/views/admin/apps/AppsWhatIsIt.tsx  |   3 +-
 .../client/views/admin/apps/BundleChips.tsx   |   5 +-
 .../views/admin/apps/CloudLoginModal.tsx      |   3 +-
 .../apps/components/AppPermissionsList.tsx    |   8 +-
 .../CategoryDropDown.stories.tsx              |   4 +-
 .../CategoryFilter/CategoryDropDown.tsx       |   5 +-
 .../CategoryFilter/CategoryDropDownAnchor.tsx |   6 +-
 .../CategoryFilter/CategoryDropDownList.tsx   |   5 +-
 .../components/CategoryFilter/TagList.tsx     |   5 +-
 .../apps/components/DropDownListWrapper.tsx   |   3 +-
 .../admin/apps/components/RadioButtonList.tsx |   5 +-
 .../RadioDropDown/RadioDownAnchor.tsx         |   5 +-
 .../RadioDropDown/RadioDropDown.stories.tsx   |   2 +-
 .../RadioDropDown/RadioDropDown.tsx           |   7 +-
 .../apps/components/ScreenshotCarousel.tsx    |   5 +-
 .../components/ScreenshotCarouselAnchor.tsx   |   5 +-
 .../views/admin/apps/definitions/AppInfo.ts   |   8 +-
 .../meteor/client/views/admin/apps/helpers.ts |   5 +-
 .../apps/helpers/filterAppsByCategories.ts    |   2 +-
 .../apps/helpers/filterAppsByDisabled.ts      |   2 +-
 .../admin/apps/helpers/filterAppsByEnabled.ts |   2 +-
 .../admin/apps/helpers/filterAppsByFree.ts    |   2 +-
 .../admin/apps/helpers/filterAppsByPaid.ts    |   2 +-
 .../views/admin/apps/helpers/installApp.ts    |   2 +-
 .../apps/helpers/normalizeFeaturedApps.ts     |   3 +-
 .../views/admin/apps/helpers/updateApp.ts     |   2 +-
 .../views/admin/apps/hooks/useAppInfo.ts      |   6 +-
 .../views/admin/apps/hooks/useCategories.ts   |   2 +-
 .../admin/apps/hooks/useCategoryFlatList.ts   |   2 +-
 .../admin/apps/hooks/useCategoryToggle.ts     |   5 +-
 .../views/admin/apps/hooks/useFeaturedApps.ts |   5 +-
 .../views/admin/apps/hooks/useFilteredApps.ts |   8 +-
 .../client/views/admin/apps/hooks/useLogs.ts  |   5 +-
 .../views/admin/apps/hooks/useRadioToggle.ts  |   2 +-
 .../client/views/admin/cloud/CloudPage.tsx    |   3 +-
 .../client/views/admin/cloud/CopyStep.tsx     |   3 +-
 .../client/views/admin/cloud/PasteStep.tsx    |   3 +-
 .../admin/customEmoji/AddCustomEmoji.tsx      |   3 +-
 .../views/admin/customEmoji/CustomEmoji.tsx   |   3 +-
 .../admin/customEmoji/CustomEmojiRoute.tsx    |   3 +-
 .../admin/customEmoji/EditCustomEmoji.tsx     |   3 +-
 .../customEmoji/EditCustomEmojiWithData.tsx   |   3 +-
 .../admin/customSounds/AddCustomSound.tsx     |   6 +-
 .../admin/customSounds/AdminSoundsRoute.tsx   |   3 +-
 .../admin/customSounds/CustomSoundRow.tsx     |   3 +-
 .../admin/customSounds/EditCustomSound.tsx    |   3 +-
 .../views/admin/customSounds/EditSound.tsx    |   3 +-
 .../customUserStatus/CustomUserStatusForm.tsx |   8 +-
 .../CustomUserStatusFormWithData.tsx          |   5 +-
 .../CustomUserStatusRoute.tsx                 |   3 +-
 .../CustomUserStatusRow.tsx                   |   5 +-
 .../CustomUserStatusTable.tsx                 |   3 +-
 .../views/admin/emailInbox/EmailInboxForm.tsx |   5 +-
 .../emailInbox/EmailInboxFormWithData.tsx     |   5 +-
 .../views/admin/emailInbox/EmailInboxPage.tsx |   3 +-
 .../admin/emailInbox/EmailInboxRoute.tsx      |   3 +-
 .../admin/emailInbox/EmailInboxTable.tsx      |   3 +-
 .../views/admin/emailInbox/SendTestButton.tsx |   5 +-
 .../FederationDashboardPage.stories.tsx       |   2 +-
 .../FederationDashboardPage.tsx               |   3 +-
 .../FederationDashboardRoute.tsx              |   3 +-
 .../OverviewSection.stories.tsx               |   2 +-
 .../federationDashboard/OverviewSection.tsx   |   3 +-
 .../ServersSection.stories.tsx                |   2 +-
 .../federationDashboard/ServersSection.tsx    |   3 +-
 .../import/ImportHistoryPage.stories.tsx      |   2 +-
 .../import/ImportOperationSummary.stories.tsx |   2 +-
 .../admin/import/NewImportPage.stories.tsx    |   2 +-
 .../views/admin/import/PrepareChannels.tsx    |   3 +-
 .../views/admin/import/PrepareUsers.tsx       |   3 +-
 .../admin/info/DeploymentCard.stories.tsx     |   2 +-
 .../views/admin/info/DeploymentCard.tsx       |   3 +-
 .../admin/info/DescriptionList.stories.tsx    |   2 +-
 .../views/admin/info/Feature.stories.tsx      |   2 +-
 .../info/FederationCard/FederationCard.tsx    |   3 +-
 .../FederationCard/components/CardHeader.tsx  |   3 +-
 .../FederationModal/DNSRecordItem.tsx         |   5 +-
 .../components/FederationModal/DNSRecords.tsx |   6 +-
 .../components/FederationModal/DNSText.tsx    |   3 +-
 .../FederationModal/FederationModal.tsx       |  12 +-
 .../FederationModal/InviteUsers.tsx           |   3 +-
 .../components/FederationModal/Types.ts       |   2 +-
 .../FederationCard/components/Section.tsx     |   3 +-
 .../components/SectionStatusIcon.tsx          |   3 +-
 .../admin/info/InformationPage.stories.tsx    |   2 +-
 .../views/admin/info/InformationRoute.tsx     |   3 +-
 .../admin/info/InstancesModal.stories.tsx     |   2 +-
 .../views/admin/info/LicenseCard.stories.tsx  |   2 +-
 .../client/views/admin/info/LicenseCard.tsx   |   3 +-
 .../info/OfflineLicenseModal.stories.tsx      |   2 +-
 .../views/admin/info/OfflineLicenseModal.tsx  |   3 +-
 .../views/admin/info/UsageCard.stories.tsx    |   2 +-
 .../client/views/admin/info/UsageCard.tsx     |   3 +-
 .../admin/info/UsagePieGraph.stories.tsx      |   5 +-
 .../client/views/admin/info/UsagePieGraph.tsx |   6 +-
 .../admin/integrations/IntegrationsPage.tsx   |   3 +-
 .../integrations/edit/HistoryContent.tsx      |   5 +-
 .../edit/OutgoingWebhookHistoryPage.tsx       |   3 +-
 .../client/views/admin/invites/InviteRow.tsx  |   3 +-
 .../views/admin/invites/InvitesPage.tsx       |   3 +-
 .../views/admin/invites/InvitesRoute.tsx      |   3 +-
 .../views/admin/mailer/Mailer.stories.tsx     |   2 +-
 .../client/views/admin/mailer/Mailer.tsx      |   5 +-
 .../client/views/admin/mailer/MailerRoute.tsx |   3 +-
 .../views/admin/oauthApps/EditOauthApp.tsx    |   8 +-
 .../admin/oauthApps/EditOauthAppWithData.tsx  |   3 +-
 .../views/admin/oauthApps/OAuthAddApp.tsx     |   6 +-
 .../views/admin/oauthApps/OAuthAppsPage.tsx   |   3 +-
 .../views/admin/oauthApps/OAuthAppsRoute.tsx  |   3 +-
 .../views/admin/oauthApps/OAuthAppsTable.tsx  |   3 +-
 .../views/admin/permissions/EditRolePage.tsx  |   5 +-
 .../permissions/EditRolePageWithData.tsx      |   5 +-
 .../permissions/PermissionsContextBar.tsx     |   3 +-
 .../admin/permissions/PermissionsRouter.tsx   |   3 +-
 .../PermissionsTable/PermissionRow.tsx        |   8 +-
 .../PermissionsTable/PermissionsTable.tsx     |   3 +-
 .../PermissionsTableFilter.tsx                |   3 +-
 .../permissions/PermissionsTable/RoleCell.tsx |   5 +-
 .../PermissionsTable/RoleHeader.tsx           |   5 +-
 .../views/admin/permissions/RoleForm.tsx      |   6 +-
 .../UsersInRole/UsersInRolePage.tsx           |   5 +-
 .../UsersInRole/UsersInRolePageWithData.tsx   |   3 +-
 .../UsersInRoleTable/UsersInRoleTable.tsx     |  20 +-
 .../UsersInRoleTable/UsersInRoleTableRow.tsx  |   5 +-
 .../UsersInRoleTableWithData.tsx              |   5 +-
 .../client/views/admin/rooms/EditRoom.tsx     |   5 +-
 .../views/admin/rooms/EditRoomContextBar.tsx  |   3 +-
 .../views/admin/rooms/EditRoomWithData.tsx    |   3 +-
 .../views/admin/rooms/FilterByTypeAndText.tsx |   3 +-
 .../client/views/admin/rooms/RoomsPage.tsx    |   3 +-
 .../client/views/admin/rooms/RoomsRoute.tsx   |   3 +-
 .../client/views/admin/rooms/RoomsTable.tsx   |   5 +-
 .../settings/EditableSettingsProvider.tsx     |  11 +-
 .../admin/settings/GroupPage.stories.tsx      |   2 +-
 .../client/views/admin/settings/GroupPage.tsx |   8 +-
 .../admin/settings/GroupPageSkeleton.tsx      |   3 +-
 .../admin/settings/GroupSelector.stories.tsx  |   2 +-
 .../views/admin/settings/GroupSelector.tsx    |   5 +-
 .../views/admin/settings/MemoizedSetting.tsx  |   5 +-
 .../settings/ResetSettingButton.stories.tsx   |   2 +-
 .../admin/settings/ResetSettingButton.tsx     |   6 +-
 .../views/admin/settings/Section.stories.tsx  |   2 +-
 .../client/views/admin/settings/Section.tsx   |   6 +-
 .../views/admin/settings/SectionSkeleton.tsx  |   3 +-
 .../views/admin/settings/Setting.stories.tsx  |   2 +-
 .../client/views/admin/settings/Setting.tsx   |   6 +-
 .../views/admin/settings/SettingSkeleton.tsx  |   3 +-
 .../admin/settings/SettingsGroupCard.tsx      |  12 +-
 .../views/admin/settings/SettingsPage.tsx     |   6 +-
 .../views/admin/settings/SettingsRoute.tsx    |   3 +-
 .../admin/settings/groups/AssetsGroupPage.tsx |   5 +-
 .../settings/groups/CreateOAuthModal.tsx      |   3 +-
 .../settings/groups/GenericGroupPage.tsx      |   5 +-
 .../admin/settings/groups/LDAPGroupPage.tsx   |   3 +-
 .../admin/settings/groups/OAuthGroupPage.tsx  |   5 +-
 .../admin/settings/groups/TabbedGroupPage.tsx |   8 +-
 .../admin/settings/groups/VoipGroupPage.tsx   |   3 +-
 .../groups/voip/AssignAgentButton.tsx         |   3 +-
 .../settings/groups/voip/AssignAgentModal.tsx |   3 +-
 .../groups/voip/RemoveAgentButton.tsx         |   3 +-
 .../groups/voip/VoipExtensionsPage.tsx        |   3 +-
 .../admin/settings/hooks/useSettingsGroups.ts |   3 +-
 .../inputs/ActionSettingInput.stories.tsx     |   4 +-
 .../settings/inputs/ActionSettingInput.tsx    |   6 +-
 .../inputs/AssetSettingInput.stories.tsx      |   2 +-
 .../settings/inputs/AssetSettingInput.tsx     |   3 +-
 .../inputs/BooleanSettingInput.stories.tsx    |   2 +-
 .../settings/inputs/BooleanSettingInput.tsx   |   3 +-
 .../admin/settings/inputs/CodeMirror.tsx      |   3 +-
 .../inputs/CodeSettingInput.stories.tsx       |   2 +-
 .../settings/inputs/CodeSettingInput.tsx      |   3 +-
 .../inputs/ColorSettingInput.stories.tsx      |   2 +-
 .../settings/inputs/ColorSettingInput.tsx     |   6 +-
 .../inputs/FontSettingInput.stories.tsx       |   2 +-
 .../settings/inputs/FontSettingInput.tsx      |   3 +-
 .../inputs/GenericSettingInput.stories.tsx    |   2 +-
 .../settings/inputs/GenericSettingInput.tsx   |   3 +-
 .../inputs/IntSettingInput.stories.tsx        |   2 +-
 .../admin/settings/inputs/IntSettingInput.tsx |   3 +-
 .../inputs/LanguageSettingInput.stories.tsx   |   2 +-
 .../settings/inputs/LanguageSettingInput.tsx  |   3 +-
 .../settings/inputs/LookupSettingInput.tsx    |   5 +-
 .../MultiSelectSettingInput.stories.tsx       |   5 +-
 .../inputs/MultiSelectSettingInput.tsx        |   6 +-
 .../inputs/PasswordSettingInput.stories.tsx   |   2 +-
 .../settings/inputs/PasswordSettingInput.tsx  |   3 +-
 .../RelativeUrlSettingInput.stories.tsx       |   2 +-
 .../inputs/RelativeUrlSettingInput.tsx        |   3 +-
 .../settings/inputs/RoomPickSettingInput.tsx  |   3 +-
 .../inputs/SelectSettingInput.stories.tsx     |   2 +-
 .../settings/inputs/SelectSettingInput.tsx    |   6 +-
 .../inputs/SelectTimezoneSettingInput.tsx     |   3 +-
 .../inputs/StringSettingInput.stories.tsx     |   2 +-
 .../settings/inputs/StringSettingInput.tsx    |   3 +-
 .../views/admin/sidebar/AdminSidebar.tsx      |   3 +-
 .../views/admin/sidebar/AdminSidebarPages.tsx |   3 +-
 .../client/views/admin/sidebar/UpgradeTab.tsx |   6 +-
 .../admin/upgrade/UpgradePage/UpgradePage.tsx |   3 +-
 .../UpgradePageError/UpgradePageError.tsx     |   3 +-
 .../admin/users/AdminUserInfoActions.tsx      |   5 +-
 .../admin/users/AdminUserInfoWithData.tsx     |   5 +-
 .../views/admin/users/EditUserWithData.tsx    |   6 +-
 .../client/views/admin/users/InviteUsers.tsx  |   3 +-
 .../client/views/admin/users/UsersPage.tsx    |   3 +-
 .../client/views/admin/users/UsersRoute.tsx   |   3 +-
 .../admin/users/UsersTable/UsersTable.tsx     |   3 +-
 .../admin/users/UsersTable/UsersTableRow.tsx  |   8 +-
 .../users/hooks/useChangeAdminStatusAction.ts |   4 +-
 .../users/hooks/useChangeUserStatusAction.ts  |   4 +-
 .../users/hooks/useConfirmOwnerChanges.tsx    |   3 +-
 .../admin/users/hooks/useDeleteUserAction.tsx |   6 +-
 .../users/hooks/useResetE2EEKeyAction.tsx     |   4 +-
 .../admin/users/hooks/useResetTOTPAction.tsx  |   4 +-
 .../views/admin/viewLogs/ServerLogs.tsx       |   5 +-
 .../admin/viewLogs/ViewLogsPage.stories.tsx   |   5 +-
 .../views/admin/viewLogs/ViewLogsPage.tsx     |   3 +-
 .../views/admin/viewLogs/ViewLogsRoute.tsx    |   3 +-
 .../client/views/banners/BannerRegion.tsx     |   3 +-
 .../client/views/banners/LegacyBanner.tsx     |   5 +-
 .../client/views/banners/UiKitBanner.tsx      |   7 +-
 .../AudioMessageRecorder.tsx                  |   7 +-
 .../client/views/directory/ChannelsTab.tsx    |   3 +-
 .../client/views/directory/DirectoryPage.tsx  |   3 +-
 .../client/views/directory/RoomTags.tsx       |   5 +-
 .../client/views/directory/TeamsTab.tsx       |   3 +-
 .../meteor/client/views/directory/UserTab.tsx |   3 +-
 .../views/e2e/EnterE2EPasswordModal.tsx       |   3 +-
 .../client/views/e2e/SaveE2EPasswordModal.tsx |   3 +-
 .../client/views/home/CustomHomePage.tsx      |   3 +-
 .../views/home/CustomHomePageContent.tsx      |   3 +-
 .../client/views/home/DefaultHomePage.tsx     |   3 +-
 apps/meteor/client/views/home/HomePage.tsx    |   3 +-
 .../client/views/home/HomePageHeader.tsx      |   3 +-
 .../client/views/home/HomepageGridItem.tsx    |   3 +-
 .../client/views/home/cards/AddUsersCard.tsx  |   3 +-
 .../views/home/cards/CreateChannelsCard.tsx   |   3 +-
 .../views/home/cards/DesktopAppsCard.tsx      |   3 +-
 .../views/home/cards/DocumentationCard.tsx    |   3 +-
 .../client/views/home/cards/JoinRoomsCard.tsx |   3 +-
 .../views/home/cards/MobileAppsCard.tsx       |   3 +-
 .../client/views/hooks/useActionSpread.ts     |   3 +-
 .../client/views/hooks/useImperativeModal.ts  |   3 +-
 .../client/views/hooks/useUpgradeTabParams.ts |   3 +-
 .../meteor/client/views/invite/InvitePage.tsx |   3 +-
 .../client/views/invite/SecretURLPage.tsx     |   3 +-
 apps/meteor/client/views/location/MapView.tsx |   3 +-
 .../client/views/location/MapViewFallback.tsx |   3 +-
 .../client/views/location/MapViewImage.tsx    |   3 +-
 .../client/views/location/MessageLocation.tsx |   3 +-
 .../views/mailer/MailerUnsubscriptionPage.tsx |   6 +-
 apps/meteor/client/views/meet/CallPage.tsx    |   3 +-
 apps/meteor/client/views/meet/MeetPage.tsx    |   3 +-
 .../client/views/meet/OngoingCallDuration.tsx |   3 +-
 .../meteor/client/views/modal/ModalRegion.tsx |   3 +-
 .../NotAuthorizedPage.stories.tsx             |   2 +-
 .../views/notAuthorized/NotAuthorizedPage.tsx |   3 +-
 .../client/views/notFound/NotFoundPage.tsx    |   3 +-
 .../views/omnichannel/OmnichannelRouter.tsx   |   3 +-
 .../views/omnichannel/additionalForms.tsx     |   3 +-
 .../views/omnichannel/agents/AddAgent.tsx     |   3 +-
 .../views/omnichannel/agents/AgentEdit.tsx    |   3 +-
 .../omnichannel/agents/AgentEditWithData.tsx  |   3 +-
 .../views/omnichannel/agents/AgentInfo.tsx    |   3 +-
 .../omnichannel/agents/AgentInfoAction.tsx    |   6 +-
 .../omnichannel/agents/AgentInfoActions.tsx   |   3 +-
 .../views/omnichannel/agents/AgentsPage.tsx   |   3 +-
 .../omnichannel/agents/AgentsPageRow.tsx      |   3 +-
 .../views/omnichannel/agents/AgentsTab.tsx    |   3 +-
 .../omnichannel/agents/RemoveAgentButton.tsx  |   3 +-
 .../omnichannel/agents/hooks/useQuery.ts      |   2 +-
 .../analytics/AnalyticsPage.stories.tsx       |   2 +-
 .../analytics/DateRangePicker.stories.tsx     |   2 +-
 .../appearance/AppearanceForm.stories.tsx     |   2 +-
 .../omnichannel/appearance/AppearanceForm.tsx |   3 +-
 .../omnichannel/appearance/AppearancePage.tsx |   6 +-
 .../appearance/AppearancePageContainer.tsx    |   3 +-
 .../BusinessHoursForm.stories.tsx             |   2 +-
 .../components/AgentInfoDetails.tsx           |   3 +-
 .../views/omnichannel/components/Field.tsx    |   3 +-
 .../views/omnichannel/components/Info.tsx     |   3 +-
 .../views/omnichannel/components/Label.tsx    |   3 +-
 .../contactHistory/ContactHistory.tsx         |   3 +-
 .../contactHistory/ContactHistoryItem.tsx     |   5 +-
 .../ContactHistoryVerticalBar.tsx             |   3 +-
 .../MessageList/ContactHistoryMessage.tsx     |   3 +-
 .../ContactHistoryMessagesVerticalBar.tsx     |   3 +-
 .../contactHistory/useHistoryList.ts          |   2 +-
 .../currentChats/CurrentChatsRoute.tsx        |   3 +-
 .../currentChats/CustomFieldsVerticalBar.tsx  |   5 +-
 .../omnichannel/currentChats/FilterByText.tsx |   3 +-
 .../views/omnichannel/currentChats/Label.tsx  |   3 +-
 .../currentChats/RemoveAllClosed.tsx          |   3 +-
 .../currentChats/RemoveChatButton.tsx         |   3 +-
 .../currentChats/hooks/useAllCustomFields.tsx |   5 +-
 .../currentChats/hooks/useCurrentChats.ts     |   3 +-
 .../hooks/useRemoveCurrentChatMutation.ts     |   5 +-
 .../customFields/CustomFieldsForm.stories.tsx |   2 +-
 .../directory/CallDialpadButton.tsx           |   3 +-
 .../directory/CallsContextualBarDirectory.tsx |   3 +-
 .../directory/ChatsContextualBar.tsx          |   3 +-
 .../omnichannel/directory/ContextualBar.tsx   |   3 +-
 .../directory/OmnichannelDirectoryPage.tsx    |   3 +-
 .../omnichannel/directory/calls/Call.tsx      |   3 +-
 .../omnichannel/directory/calls/CallTab.tsx   |   3 +-
 .../omnichannel/directory/calls/CallTable.tsx |   3 +-
 .../directory/calls/CallTableRow.tsx          |   5 +-
 .../contextualBar/CallsContextualBarRoom.tsx  |   3 +-
 .../calls/contextualBar/InfoField.tsx         |   3 +-
 .../calls/contextualBar/VoipInfo.tsx          |   3 +-
 .../contextualBar/VoipInfoCallButton.tsx      |   3 +-
 .../omnichannel/directory/chats/Chat.tsx      |   3 +-
 .../omnichannel/directory/chats/ChatTab.tsx   |   3 +-
 .../omnichannel/directory/chats/ChatTable.tsx |   3 +-
 .../chats/contextualBar/SourceField.tsx       |   3 +-
 .../directory/contacts/ContactTable.tsx       |   3 +-
 .../contacts/contextualBar/ContactNewEdit.tsx |   5 +-
 .../contextualBar/ContactsContextualBar.tsx   |   3 +-
 .../omnichannel/facebook/FacebookPage.tsx     |   3 +-
 .../facebook/FacebookPageContainer.tsx        |   3 +-
 .../views/omnichannel/facebook/PageToggle.tsx |   3 +-
 .../facebook/PageToggleAssembler.tsx          |   3 +-
 .../installation/Installation.stories.tsx     |   2 +-
 .../omnichannel/installation/Installation.tsx |   3 +-
 .../omnichannel/installation/Wrapper.tsx      |   3 +-
 .../views/omnichannel/managers/AddManager.tsx |   3 +-
 .../omnichannel/managers/ManagersRoute.tsx    |   3 +-
 .../managers/RemoveManagerButton.tsx          |   3 +-
 .../omnichannel/queueList/QueueListFilter.tsx |   3 +-
 .../omnichannel/queueList/QueueListPage.tsx   |   3 +-
 .../views/omnichannel/queueList/index.tsx     |   3 +-
 .../counter/CounterContainer.stories.tsx      |   2 +-
 .../sidebar/OmnichannelSidebar.tsx            |   3 +-
 .../triggers/TriggersForm.stories.tsx         |   2 +-
 .../omnichannel/triggers/TriggersForm.tsx     |   6 +-
 .../Announcement/Announcement.stories.tsx     |   2 +-
 .../views/room/Announcement/Announcement.tsx  |   3 +-
 .../Announcement/AnnouncementComponent.tsx    |   3 +-
 .../views/room/Header/DirectRoomHeader.tsx    |   3 +-
 .../client/views/room/Header/Header.tsx       |   3 +-
 .../views/room/Header/HeaderIconWithRoom.tsx  |   6 +-
 .../room/Header/Omnichannel/BackButton.tsx    |   3 +-
 .../Omnichannel/OmnichannelRoomHeader.tsx     |   5 +-
 .../Omnichannel/QuickActions/QuickActions.tsx |   5 +-
 .../hooks/usePutChatOnHoldMutation.ts         |   5 +-
 .../QuickActions/hooks/useQuickActions.tsx    |   3 +-
 .../hooks/useReturnChatToQueueMutation.ts     |   5 +-
 .../Header/Omnichannel/QuickActions/index.ts  |   1 -
 .../Header/Omnichannel/VoipRoomHeader.tsx     |  10 +-
 .../client/views/room/Header/ParentRoom.tsx   |   3 +-
 .../views/room/Header/ParentRoomWithData.tsx  |   3 +-
 .../Header/ParentRoomWithEndpointData.tsx     |   3 +-
 .../client/views/room/Header/ParentTeam.tsx   |   3 +-
 .../client/views/room/Header/RoomHeader.tsx   |   3 +-
 .../client/views/room/Header/RoomTitle.tsx    |   3 +-
 .../views/room/Header/ToolBox/ToolBox.tsx     |  11 +-
 .../client/views/room/Header/ToolBox/index.ts |   1 -
 .../views/room/Header/icons/Translate.tsx     |   3 +-
 .../views/room/MessageList/MessageList.tsx    |   6 +-
 .../MessageList/MessageListErrorBoundary.tsx  |   3 +-
 .../room/MessageList/components/Message.tsx   |   5 +-
 .../MessageList/components/MessageContent.tsx |  13 +-
 .../components/MessageContentBody.tsx         |   8 +-
 .../components/MessageContentIgnored.tsx      |   3 +-
 .../MessageList/components/MessageHeader.tsx  |   7 +-
 .../components/MessageIndicators.tsx          |   6 +-
 .../components/MessageReaction.tsx            |   6 +-
 .../components/MessageReactionsList.tsx       |   5 +-
 .../components/MessageReadReceipt.tsx         |   3 +-
 .../components/MessageRolesList.tsx           |   3 +-
 .../MessageList/components/MessageSystem.tsx  |  10 +-
 .../components/ThreadMessagePreview.tsx       |   5 +-
 .../components/ThreadMessagePreviewBody.tsx   |   5 +-
 .../components/Toolbox/MessageActionMenu.tsx  |   5 +-
 .../components/Toolbox/Toolbox.tsx            |   9 +-
 .../components/Toolbox/ToolboxDropdown.tsx    |   3 +-
 .../Toolbox/ToolboxDropdownDesktop.tsx        |   3 +-
 .../Toolbox/ToolboxDropdownMobile.tsx         |   3 +-
 .../components/Toolbox/ToolboxWrapper.tsx     |   3 +-
 .../UrlPreview/OEmbedCollapsible.tsx          |   3 +-
 .../UrlPreview/OEmbedHtmlPreview.tsx          |   3 +-
 .../UrlPreview/OEmbedImagePreview.tsx         |   3 +-
 .../UrlPreview/OEmbedLinkPreview.tsx          |   3 +-
 .../UrlPreview/OEmbedPreviewContent.tsx       |   3 +-
 .../components/UrlPreview/OEmbedResolver.tsx  |   3 +-
 .../components/UrlPreview/PreviewList.tsx     |   9 +-
 .../components/UrlPreview/UrlAudioPreview.tsx |   7 +-
 .../components/UrlPreview/UrlImagePreview.tsx |   7 +-
 .../components/UrlPreview/UrlPreview.tsx      |   7 +-
 .../UrlPreview/UrlPreviewResolver.tsx         |   7 +-
 .../components/UrlPreview/UrlVideoPreview.tsx |   7 +-
 .../contexts/MessageHighlightContext.tsx      |   2 +-
 .../contexts/MessageListContext.tsx           |   2 +-
 .../room/MessageList/hooks/useMessageBody.tsx |   2 +-
 .../room/MessageList/hooks/useMessages.ts     |  11 +-
 .../MessageList/hooks/useParentMessage.ts     |   5 +-
 .../room/MessageList/lib/isMessageNewDay.ts   |   2 +-
 .../MessageList/lib/isMessageSequential.ts    |   2 +-
 .../room/MessageList/lib/isParsedMessage.ts   |   2 +-
 .../lib/parseMessageTextToAstMarkdown.ts      |  14 +-
 .../providers/MessageHighlightProvider.tsx    |   3 +-
 .../providers/MessageListProvider.tsx         |  16 +-
 .../providers/messageHighlightSubscription.ts |   2 +-
 .../views/room/Room/ComposerSkeleton.tsx      |   3 +-
 apps/meteor/client/views/room/Room/Room.tsx   |   3 +-
 .../meteor/client/views/room/RoomNotFound.tsx |   3 +-
 .../meteor/client/views/room/RoomSkeleton.tsx |   3 +-
 .../room/ShareLocation/ShareLocationModal.tsx |   5 +-
 .../views/room/UserCard/UserCardWithData.tsx  |   5 +-
 .../views/room/components/BlazeTemplate.tsx   |   3 +-
 .../room/components/VerticalBarOldActions.tsx |  13 +-
 .../components/body/DropTargetOverlay.tsx     |   3 +-
 .../body/ErroredUploadProgressIndicator.tsx   |   5 +-
 .../body/JumpToRecentMessagesBar.tsx          |   3 +-
 .../views/room/components/body/LeaderBar.tsx  |   5 +-
 .../body/LegacyMessageTemplateList.tsx        |   5 +-
 .../body/LoadingMessagesIndicator.tsx         |   3 +-
 .../components/body/NewMessagesButton.tsx     |   3 +-
 .../body/RetentionPolicyWarning.tsx           |   3 +-
 .../views/room/components/body/RoomBody.tsx   |  10 +-
 .../room/components/body/RoomForeword.tsx     |   6 +-
 .../body/UnreadMessagesIndicator.tsx          |   3 +-
 .../body/UploadProgressIndicator.tsx          |   5 +-
 .../body/composer/ComposerAnonymous.tsx       |   3 +-
 .../body/composer/ComposerBlocked.tsx         |   3 +-
 .../body/composer/ComposerContainer.tsx       |   6 +-
 .../composer/ComposerJoinWithPassword.tsx     |   3 +-
 .../body/composer/ComposerMessage.tsx         |   7 +-
 .../ComposerOmnichannel.tsx                   |   8 +-
 .../ComposerOmnichannelInquiry.tsx            |   3 +-
 .../ComposerOmnichannelJoin.tsx               |   3 +-
 .../ComposerOmnichannelOnHold.tsx             |   3 +-
 .../hooks/useResumeChatOnHoldMutation.ts      |   5 +-
 .../composer/ComposerOmnichannel/index.tsx    |   2 +-
 .../body/composer/ComposerReadOnly.tsx        |   3 +-
 .../components/body/composer/ComposerVoIP.tsx |   3 +-
 .../hooks/useMessageComposerCanJoin.ts        |   2 +-
 .../hooks/useMessageComposerIsBlocked.ts      |   3 +-
 .../hooks/useMessageComposerIsReadOnly.ts     |   2 +-
 .../room/components/body/useDropTarget.ts     |   4 +-
 .../body/useFileUploadDropTarget.ts           |   6 +-
 .../room/components/body/useMessageContext.ts |   2 +-
 .../components/body/useRetentionPolicy.ts     |   2 +-
 .../components/body/useRoomRolesManagement.ts |   4 +-
 .../room/components/body/useUnreadMessages.ts |   5 +-
 .../client/views/room/contexts/ChatContext.ts |   2 +-
 .../views/room/contexts/MessageContext.ts     |   5 +-
 .../client/views/room/contexts/RoomContext.ts |   3 +-
 .../views/room/contexts/ToolboxContext.ts     |   5 +-
 .../views/room/contextualBar/Apps/Apps.tsx    |   4 +-
 .../room/contextualBar/Apps/AppsWithData.tsx  |   7 +-
 .../AutoTranslate/AutoTranslate.stories.tsx   |   2 +-
 .../AutoTranslate/AutoTranslate.tsx           |   3 +-
 .../AutoTranslate/AutoTranslateWithData.tsx   |   5 +-
 .../Discussions/useDiscussionsList.ts         |   3 +-
 .../ExportMessages/ExportMessages.stories.tsx |   2 +-
 .../ExportMessages/ExportMessages.tsx         |   8 +-
 .../ExportMessages/FileExport.tsx             |   8 +-
 .../ExportMessages/MailExportForm.tsx         |   5 +-
 .../Info/RoomInfo/RoomInfo.stories.tsx        |   2 +-
 .../KeyboardShortcutSection.tsx               |   3 +-
 .../KeyboardShortcuts.stories.tsx             |   2 +-
 .../KeyboardShortcuts/KeyboardShortcuts.tsx   |   3 +-
 .../KeyboardShortcutsWithData.tsx             |   5 +-
 .../NotificationPreferences.stories.tsx       |   2 +-
 .../NotificationPreferences.tsx               |   5 +-
 .../NotificationPreferencesWithData.tsx       |   3 +-
 .../components/NotificationByDevice.tsx       |   3 +-
 .../components/NotificationToogle.tsx         |   3 +-
 .../components/Preferences.tsx                |   3 +-
 .../room/contextualBar/OTR/OTR.stories.tsx    |   2 +-
 .../views/room/contextualBar/OTR/OTR.tsx      |   3 +-
 .../room/contextualBar/OTR/OTRWithData.tsx    |   5 +-
 .../OTR/components/OTREstablished.tsx         |   3 +-
 .../OTR/components/OTRStates.tsx              |   6 +-
 .../PruneMessages/PruneMessages.stories.tsx   |   2 +-
 .../PruneMessages/PruneMessages.tsx           |   7 +-
 .../PruneMessagesDateTimeRow.tsx              |   3 +-
 .../PruneMessages/PruneMessagesWithData.tsx   |   8 +-
 .../RoomFiles/RoomFiles.stories.tsx           |   2 +-
 .../RoomFiles/components/FileItem.stories.tsx |   2 +-
 .../components/FileItemIcon.stories.tsx       |   2 +-
 .../RoomFiles/hooks/useFilesList.ts           |   5 +-
 .../RoomMembers/AddUsers/AddUsers.stories.tsx |   2 +-
 .../RoomMembers/AddUsers/AddUsers.tsx         |   5 +-
 .../RoomMembers/AddUsers/AddUsersWithData.tsx |   6 +-
 .../InviteUsers/EditInviteLink.tsx            |   6 +-
 .../RoomMembers/InviteUsers/InviteLink.tsx    |   3 +-
 .../InviteUsers/InviteUsers.stories.tsx       |   2 +-
 .../RoomMembers/InviteUsers/InviteUsers.tsx   |   3 +-
 .../InviteUsers/InviteUsersWithData.tsx       |   5 +-
 .../RoomMembers/RoomMembers.stories.tsx       |   2 +-
 .../contextualBar/RoomMembers/RoomMembers.tsx |  12 +-
 .../RoomMembers/RoomMembersActions.tsx        |   5 +-
 .../RoomMembers/RoomMembersItem.tsx           |   5 +-
 .../RoomMembers/RoomMembersRow.tsx            |   5 +-
 .../RoomMembers/RoomMembersWithData.tsx       |   6 +-
 .../room/contextualBar/Threads/ThreadList.tsx |   3 +-
 .../room/contextualBar/Threads/ThreadRow.tsx  |   3 +-
 .../Threads/components/ThreadListMessage.tsx  |   5 +-
 .../contextualBar/Threads/useThreadsList.ts   |   3 +-
 .../room/contextualBar/Threads/withData.tsx   |   7 +-
 .../UserInfo/UserInfoActions.tsx              |   5 +-
 .../UserInfo/UserInfoWithData.tsx             |   5 +-
 .../VideoConference/VideoConfBlockModal.tsx   |   3 +-
 .../VideoConference/VideoConfConfigModal.tsx  |   3 +-
 .../VideoConfList/VideoConfList.tsx           |   5 +-
 .../VideoConfList/VideoConfListItem.tsx       |   5 +-
 .../VideoConfList/VideoConfListWithData.tsx   |   5 +-
 .../VideoConfPopup/IncomingPopup.tsx          |   5 +-
 .../VideoConfPopup/OutgoingPopup.tsx          |   5 +-
 .../VideoConfPopup/StartCallPopup.tsx         |   9 +-
 .../VideoConfPopup/TimedVideoConfPopup.tsx    |   5 +-
 .../VideoConfPopup/VideoConfPopupRoomInfo.tsx |   6 +-
 .../VideoConfPopups/VideoConfPopups.tsx       |  13 +-
 .../views/room/hooks/useAppsContextualBar.ts  |   2 +-
 .../client/views/room/hooks/useIsVisible.ts   |   3 +-
 .../views/room/hooks/useUserHasRoomRole.ts    |   2 +-
 .../actions/useBlockUserAction.ts             |   4 +-
 .../actions/useCallAction.tsx                 |   5 +-
 .../actions/useChangeLeaderAction.ts          |   4 +-
 .../actions/useChangeModeratorAction.ts       |   4 +-
 .../actions/useChangeOwnerAction.tsx          |   4 +-
 .../actions/useDirectMessageAction.ts         |   4 +-
 .../actions/useIgnoreUserAction.ts            |   4 +-
 .../actions/useMuteUserAction.tsx             |   4 +-
 .../actions/useRemoveUserAction.tsx           |   5 +-
 .../useUserInfoActions/useUserInfoActions.ts  |   4 +-
 .../client/views/room/layout/RoomLayout.tsx   |   3 +-
 .../lib/QuickActions/QuickActionsContext.tsx  |  11 +-
 .../views/room/lib/QuickActions/index.tsx     |   9 +-
 .../views/room/lib/Toolbox/generator.tsx      |   3 +-
 .../client/views/room/lib/Toolbox/index.tsx   |  11 +-
 .../views/room/lib/getRoomDirectives.ts       |   2 +-
 .../modals/FileUploadModal/FilePreview.tsx    |   3 +-
 .../FileUploadModal.stories.tsx               |   2 +-
 .../FileUploadModal/FileUploadModal.tsx       |   3 +-
 .../modals/FileUploadModal/GenericPreview.tsx |   3 +-
 .../modals/FileUploadModal/ImagePreview.tsx   |   3 +-
 .../modals/FileUploadModal/MediaPreview.tsx   |   3 +-
 .../FileUploadModal/PreviewSkeleton.tsx       |   3 +-
 .../ReactionListModal/ReactionListModal.tsx   |   5 +-
 .../ReactionListModal/ReactionUserTag.tsx     |   7 +-
 .../modals/ReactionListModal/Reactions.tsx    |   3 +-
 .../ReadReceiptsModal/ReadReceiptRow.tsx      |   3 +-
 .../ReadReceiptsModal/ReadReceiptsModal.tsx   |   5 +-
 .../ReportMessageModal/ReportMessageModal.tsx |   5 +-
 .../views/room/providers/ChatProvider.tsx     |   3 +-
 .../views/room/providers/MessageProvider.tsx  |   5 +-
 .../views/room/providers/RoomProvider.tsx     |   5 +-
 .../providers/SelectedMessagesProvider.tsx    |   3 +-
 .../views/room/providers/ToolboxProvider.tsx  |  10 +-
 .../views/room/providers/VirtualAction.tsx    |   7 +-
 .../room/providers/hooks/useToolboxActions.ts |   5 +-
 .../views/room/threads/ThreadComponent.tsx    |   3 +-
 .../views/room/threads/ThreadSkeleton.tsx     |   3 +-
 .../client/views/room/threads/ThreadView.tsx  |   3 +-
 .../room/webdav/AddWebdavAccountModal.tsx     |   6 +-
 .../views/room/webdav/SaveToWebdavModal.tsx   |   8 +-
 .../FilePickerBreadcrumbs.tsx                 |   3 +-
 .../WebdavFilePickerGrid.tsx                  |   5 +-
 .../WebdavFilePickerGridItem.tsx              |   3 +-
 .../WebdavFilePickerModal.tsx                 |   8 +-
 .../WebdavFilePickerTable.tsx                 |   5 +-
 .../lib/sortWebdavNodes.ts                    |   2 +-
 apps/meteor/client/views/root/AppLayout.tsx   |   3 +-
 apps/meteor/client/views/root/AppRoot.tsx     |   3 +-
 .../client/views/root/BlazeTemplate.tsx       |   5 +-
 .../root/MainLayout/AuthenticationCheck.tsx   |   3 +-
 .../root/MainLayout/LayoutWithSidebar.tsx     |   3 +-
 .../views/root/MainLayout/LoginPage.tsx       |   3 +-
 .../views/root/MainLayout/MainLayout.tsx      |   3 +-
 .../root/MainLayout/PasswordChangeCheck.tsx   |   3 +-
 .../client/views/root/MainLayout/Preload.tsx  |   3 +-
 .../MainLayout/TwoFactorAuthSetupCheck.tsx    |   3 +-
 .../views/root/MainLayout/UsernameCheck.tsx   |   3 +-
 apps/meteor/client/views/root/PageLoading.tsx |   3 +-
 .../meteor/client/views/root/PortalWrapper.ts |   3 +-
 .../client/views/root/PortalsWrapper.tsx      |   3 +-
 .../views/setupWizard/SetupWizardPage.tsx     |   3 +-
 .../views/setupWizard/SetupWizardRoute.tsx    |   3 +-
 .../contexts/SetupWizardContext.tsx           |   3 +-
 .../views/setupWizard/hooks/useParameters.ts  |   3 +-
 .../views/setupWizard/hooks/useStepRouting.ts |   3 +-
 .../providers/SetupWizardProvider.tsx         |   3 +-
 .../views/setupWizard/steps/AdminInfoStep.tsx |   3 +-
 .../steps/CloudAccountConfirmation.tsx        |   3 +-
 .../steps/OrganizationInfoStep.tsx            |   6 +-
 .../setupWizard/steps/RegisterServerStep.tsx  |   3 +-
 .../ChannelDesertionTable.tsx                 |   6 +-
 .../ChannelDesertionTableRow.tsx              |   5 +-
 .../BaseConvertToChannelModal.tsx             |   6 +-
 .../ConvertToChannelModal.tsx                 |   6 +-
 .../ModalSteps/FirstStep.tsx                  |   6 +-
 .../ModalSteps/SecondStep.tsx                 |   6 +-
 .../AddExistingModal/AddExistingModal.tsx     |   6 +-
 .../channels/AddExistingModal/RoomsInput.tsx  |   9 +-
 .../ConfirmationModal/ConfirmationModal.tsx   |   3 +-
 .../teams/contextualBar/channels/tabBar.ts    |   3 +-
 .../info/Delete/DeleteTeamModal.stories.tsx   |   2 +-
 .../info/Delete/DeleteTeamModalWithRooms.tsx  |   5 +-
 .../LeaveTeamModal/LeaveTeamModal.stories.tsx |   2 +-
 .../LeaveTeamModal/LeaveTeamModal.tsx         |   5 +-
 .../LeaveTeamModal/LeaveTeamModalChannels.tsx |   5 +-
 .../LeaveTeamModalConfirmation.tsx            |   5 +-
 .../info/LeaveTeam/LeaveTeamWithData.tsx      |   5 +-
 .../contextualBar/info/TeamsInfo.stories.tsx  |   4 +-
 .../teams/contextualBar/info/TeamsInfo.tsx    |  11 +-
 .../views/teams/contextualBar/info/tabBar.ts  |   3 +-
 apps/meteor/ee/client/audit/AuditLogPage.tsx  |   3 +-
 .../ee/client/audit/AuditPage.stories.tsx     |   2 +-
 .../ee/client/audit/DateRangePicker.tsx       |   3 +-
 .../deviceManagement/LoggedOutBanner.tsx      |   3 +-
 .../components/DeviceIcon.tsx                 |   3 +-
 .../DeviceManagementTable.tsx                 |   7 +-
 .../ee/client/hooks/useDevicesMenuOption.tsx  |   3 +-
 .../ee/client/hooks/useHasLicenseModule.ts    |   2 +-
 apps/meteor/ee/client/hooks/useVoipClient.ts  |   3 +-
 .../ee/client/hooks/useVoipFooterMenu.tsx     |   3 +-
 .../meteor/ee/client/lib/voip/EEVoipClient.ts |   5 +-
 .../BusinessHoursTable.stories.tsx            |   2 +-
 .../BusinessHoursMultiple.stories.tsx         |   2 +-
 .../BusinessHoursTimeZone.stories.tsx         |   2 +-
 .../additionalForms/MaxChatsPerAgent.tsx      |   3 +-
 .../omnichannel/additionalForms/register.ts   |   4 +-
 .../cannedResponses/CannedResponseEdit.tsx    |   6 +-
 .../CannedResponseEditWithData.tsx            |   3 +-
 .../CannedResponseEditWithDepartmentData.tsx  |   6 +-
 .../cannedResponses/CannedResponseFilter.tsx  |   6 +-
 .../cannedResponses/CannedResponseNew.tsx     |   3 +-
 .../cannedResponses/CannedResponsesPage.tsx   |   3 +-
 .../cannedResponses/CannedResponsesRoute.tsx  |   3 +-
 .../RemoveCannedResponseButton.tsx            |   3 +-
 .../components/cannedResponseForm.tsx         |   3 +-
 .../InsertPlaceholderDropdown.tsx             |   3 +-
 .../MarkdownTextEditor.stories.tsx            |   2 +-
 .../MarkdownTextEditor/index.tsx              |   3 +-
 .../CannedResponse/TextEditor/IconButton.tsx  |   3 +-
 .../CannedResponse/TextEditor/TextButton.tsx  |   3 +-
 .../TextEditor/TextEditor.stories.tsx         |   2 +-
 .../CannedResponse/TextEditor/Textarea.tsx    |   3 +-
 .../CannedResponse/TextEditor/Toolbox.tsx     |   3 +-
 .../CannedResponse/TextEditor/index.tsx       |   3 +-
 .../CreateCannedResponseModal.stories.tsx     |   2 +-
 .../CreateCannedResponseModal.tsx             |   3 +-
 .../CreateCannedResponse/PreviewText.tsx      |   3 +-
 .../CreateCannedResponse/SharingOptions.tsx   |   3 +-
 .../modals/CreateCannedResponse/index.tsx     |   3 +-
 .../CannedResponse/CannedResponse.stories.tsx |   2 +-
 .../CannedResponse/CannedResponse.tsx         |   3 +-
 .../CannedResponseList.stories.tsx            |   2 +-
 .../CannedResponse/CannedResponseList.tsx     |   3 +-
 .../CannedResponse/Item.stories.tsx           |   2 +-
 .../contextualBar/CannedResponse/Item.tsx     |   3 +-
 .../CannedResponse/WrapCannedResponse.tsx     |   3 +-
 .../contextualBar/CannedResponse/index.tsx    |   3 +-
 .../omnichannel/tags/CurrentChatTags.tsx      |   3 +-
 .../tags/TagEditWithDepartmentData.tsx        |   3 +-
 .../omnichannel/units/UnitEditWithData.tsx    |   3 +-
 .../sidebar/footer/SidebarFooterWatermark.tsx |   3 +-
 .../DeviceManagementAccountPage.tsx           |   3 +-
 .../DeviceManagementAccountRow.tsx            |   3 +-
 .../DeviceManagementAccountTable.tsx          |   3 +-
 .../DeviceManagementAdminPage.tsx             |   3 +-
 .../DeviceManagementAdminRoute.tsx            |   3 +-
 .../DeviceManagementAdminRow.tsx              |   3 +-
 .../DeviceManagementAdminTable.tsx            |   5 +-
 .../DeviceManagementInfo.tsx                  |   5 +-
 .../DeviceManagementInfoWithData.tsx          |   5 +-
 .../EngagementDashboardCard.tsx               |   3 +-
 .../EngagementDashboardCardErrorBoundary.tsx  |   3 +-
 .../EngagementDashboardCardFilter.tsx         |   3 +-
 .../EngagementDashboardPage.stories.tsx       |   5 +-
 .../EngagementDashboardPage.tsx               |   3 +-
 .../EngagementDashboardRoute.tsx              |   3 +-
 .../channels/ChannelsOverview.tsx             |   3 +-
 .../channels/ChannelsTab.stories.tsx          |   2 +-
 .../channels/ChannelsTab.tsx                  |   3 +-
 .../channels/useChannelsList.ts               |   3 +-
 .../dataView/DownloadDataButton.tsx           |   6 +-
 .../dataView/LegendSymbol.stories.tsx         |   5 +-
 .../dataView/LegendSymbol.tsx                 |   3 +-
 .../dataView/PeriodSelector.tsx               |   6 +-
 .../engagementDashboard/dataView/periods.ts   |   2 +-
 .../dataView/usePeriodLabel.ts                |   3 +-
 .../dataView/usePeriodSelectorState.ts        |   2 +-
 .../messages/MessagesPerChannelSection.tsx    |   3 +-
 .../messages/MessagesSentSection.tsx          |   3 +-
 .../messages/MessagesTab.stories.tsx          |   2 +-
 .../messages/MessagesTab.tsx                  |   3 +-
 .../messages/useMessageOrigins.ts             |   3 +-
 .../messages/useMessagesSent.ts               |   3 +-
 .../messages/useTopFivePopularChannels.ts     |   3 +-
 .../users/ActiveUsersSection.tsx              |   7 +-
 .../users/BusiestChatTimesSection.tsx         |   3 +-
 .../users/ContentForDays.tsx                  |   3 +-
 .../users/ContentForHours.tsx                 |   3 +-
 .../users/NewUsersSection.tsx                 |   3 +-
 .../users/UsersByTimeOfTheDaySection.tsx      |   3 +-
 .../users/UsersTab.stories.tsx                |   5 +-
 .../engagementDashboard/users/UsersTab.tsx    |   3 +-
 .../engagementDashboard/users/useNewUsers.ts  |   3 +-
 .../users/useUsersByTimeOfTheDay.ts           |   3 +-
 .../ee/client/views/admin/info/SeatsCard.tsx  |   3 +-
 .../admin/users/CloseToSeatsCapModal.tsx      |   3 +-
 .../admin/users/ReachedSeatsCapModal.tsx      |   3 +-
 .../SeatsCapUsage/SeatsCapUsage.stories.tsx   |   3 +-
 .../users/SeatsCapUsage/SeatsCapUsage.tsx     |   3 +-
 .../UserPageHeaderContentWithSeatsCap.tsx     |   3 +-
 .../components/modals/WrapUpCallModal.tsx     |   6 +-
 .../client/voip/modal/DialPad/DialInput.tsx   |   3 +-
 .../modal/DialPad/DialPadModal.stories.tsx    |   2 +-
 .../voip/modal/DialPad/DialPadModal.tsx       |   3 +-
 .../ee/client/voip/modal/DialPad/Pad.tsx      |   3 +-
 .../client/voip/modal/DialPad/PadButton.tsx   |   3 +-
 .../voip/modal/DialPad/hooks/useDialPad.tsx   |   5 +-
 .../voip/modal/DialPad/hooks/useLongPress.tsx |   3 +-
 .../voip/modals/DeviceSettingsModal.tsx       |   9 +-
 apps/meteor/ee/definition/methods.ts          |   3 +-
 .../definition/rest/v1/engagementDashboard.ts |   1 +
 .../rest/v1/omnichannel/businessHours.ts      |   1 +
 .../rest/v1/omnichannel/businessUnits.ts      |   1 +
 .../rest/v1/omnichannel/cannedResponses.ts    |   1 +
 .../ee/definition/rest/v1/sessions/index.ts   |   2 +-
 .../definition/rest/v1/sessions/sessions.ts   |   1 +
 apps/meteor/tests/e2e/apps.spec.ts            |   2 +-
 1171 files changed, 2868 insertions(+), 1893 deletions(-)

diff --git a/apps/meteor/.storybook/decorators.tsx b/apps/meteor/.storybook/decorators.tsx
index 3da8357a123..a295c4ab60b 100644
--- a/apps/meteor/.storybook/decorators.tsx
+++ b/apps/meteor/.storybook/decorators.tsx
@@ -1,5 +1,6 @@
-import { DecoratorFunction } from '@storybook/addons';
-import React, { ReactElement } from 'react';
+import type { DecoratorFunction } from '@storybook/addons';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import ModalContextMock from '../client/stories/contexts/ModalContextMock';
 import QueryClientProviderMock from '../client/stories/contexts/QueryClientProviderMock';
diff --git a/apps/meteor/client/.eslintrc.json b/apps/meteor/client/.eslintrc.json
index 0bf87a219c3..ba61292c8cb 100644
--- a/apps/meteor/client/.eslintrc.json
+++ b/apps/meteor/client/.eslintrc.json
@@ -1,51 +1,25 @@
 {
   "root": true,
-  "extends": [
-    "@rocket.chat/eslint-config/original",
-    "prettier"
-  ],
+  "extends": ["@rocket.chat/eslint-config/original", "prettier"],
   "parser": "@babel/eslint-parser",
-  "plugins": [
-    "react",
-    "react-hooks",
-    "prettier",
-    "testing-library",
-    "anti-trojan-source"
-  ],
+  "plugins": ["react", "react-hooks", "prettier", "testing-library", "anti-trojan-source"],
   "rules": {
     "import/named": "error",
     "import/order": [
       "error",
       {
         "newlines-between": "always",
-        "groups": [
-          "builtin",
-          "external",
-          "internal",
-          [
-            "parent",
-            "sibling",
-            "index"
-          ]
-        ],
+        "groups": ["builtin", "external", "internal", ["parent", "sibling", "index"]],
         "alphabetize": {
           "order": "asc"
         }
       }
     ],
-    "jsx-quotes": [
-      "error",
-      "prefer-single"
-    ],
+    "jsx-quotes": ["error", "prefer-single"],
     "new-cap": [
       "error",
       {
-        "capIsNewExceptions": [
-          "HTML.Comment",
-          "HTML.Raw",
-          "HTML.DIV",
-          "SHA256"
-        ]
+        "capIsNewExceptions": ["HTML.Comment", "HTML.Raw", "HTML.DIV", "SHA256"]
       }
     ],
     "prefer-arrow-callback": [
@@ -59,10 +33,7 @@
     "react/jsx-uses-react": "error",
     "react/jsx-uses-vars": "error",
     "react/jsx-no-undef": "error",
-    "react/jsx-fragments": [
-      "error",
-      "syntax"
-    ],
+    "react/jsx-fragments": ["error", "syntax"],
     "react/no-multi-comp": "error",
     "react-hooks/rules-of-hooks": "error",
     "react-hooks/exhaustive-deps": [
@@ -76,11 +47,7 @@
   "settings": {
     "import/resolver": {
       "node": {
-        "extensions": [
-          ".js",
-          ".ts",
-          ".tsx"
-        ]
+        "extensions": [".js", ".ts", ".tsx"]
       }
     },
     "react": {
@@ -93,81 +60,74 @@
   },
   "overrides": [
     {
-      "files": [
-        "**/*.ts",
-        "**/*.tsx"
-      ],
-      "extends": [
-        "plugin:@typescript-eslint/recommended",
-        "plugin:@typescript-eslint/eslint-recommended",
-        "@rocket.chat/eslint-config/original",
-        "prettier"
-      ],
-      "parser": "@typescript-eslint/parser",
-      "plugins": [
-        "@typescript-eslint",
-        "react",
-        "react-hooks",
-        "prettier"
-      ],
+      "files": ["**/*.ts", "**/*.tsx"],
+      "extends": ["@rocket.chat/eslint-config"],
+      "plugins": ["react", "react-hooks"],
       "rules": {
-        "@typescript-eslint/ban-types": "warn",
-				"@typescript-eslint/ban-ts-comment": "warn",
-        "@typescript-eslint/explicit-function-return-type": "warn",
-        "@typescript-eslint/indent": "off",
-        "@typescript-eslint/no-extra-parens": "off",
-        "@typescript-eslint/no-explicit-any": "off",
-        "@typescript-eslint/no-unused-vars": [
+        "@typescript-eslint/naming-convention": [
           "error",
           {
-            "argsIgnorePattern": "^_"
+            "selector": ["function", "parameter", "variable"],
+            "modifiers": ["destructured"],
+            "format": null
+          },
+          {
+            "selector": ["variable"],
+            "format": ["camelCase", "UPPER_CASE", "PascalCase"],
+            "leadingUnderscore": "allowSingleOrDouble"
+          },
+          {
+            "selector": ["function"],
+            "format": ["camelCase", "PascalCase"],
+            "leadingUnderscore": "allowSingleOrDouble"
+          },
+          {
+            "selector": ["parameter"],
+            "format": ["PascalCase"],
+            "filter": {
+              "regex": "Component$",
+              "match": true
+            }
+          },
+          {
+            "selector": ["parameter"],
+            "format": ["camelCase"],
+            "leadingUnderscore": "allow"
+          },
+          {
+            "selector": ["parameter"],
+            "format": ["camelCase"],
+            "modifiers": ["unused"],
+            "leadingUnderscore": "require"
+          },
+          {
+            "selector": ["interface"],
+            "format": ["PascalCase"],
+            "custom": {
+              "regex": "^I[A-Z]",
+              "match": true
+            }
           }
         ],
-        "@typescript-eslint/prefer-optional-chain": "warn",
-        "func-call-spacing": "off",
-        "indent": "off",
+        "@typescript-eslint/no-extra-parens": "off",
         "import/order": [
           "error",
           {
             "newlines-between": "always",
-            "groups": [
-              "builtin",
-              "external",
-              "internal",
-              [
-                "parent",
-                "sibling",
-                "index"
-              ]
-            ],
+            "groups": ["builtin", "external", "internal", ["parent", "sibling", "index"]],
             "alphabetize": {
               "order": "asc"
             }
           }
         ],
-        "jsx-quotes": [
-          "error",
-          "prefer-single"
-        ],
         "new-cap": [
           "error",
           {
-            "capIsNewExceptions": [
-              "HTML.Comment",
-              "HTML.Raw",
-              "HTML.DIV",
-              "SHA256"
-            ]
+            "capIsNewExceptions": ["HTML.Comment", "HTML.Raw", "HTML.DIV", "SHA256"]
           }
         ],
 				"no-empty-function": "off",
         "no-extra-parens": "off",
-				"no-redeclare": "off",
-        "no-spaced-func": "off",
-				"no-undef": "off",
-        "no-unused-vars": "off",
-        "no-useless-constructor": "off",
-        "no-use-before-define": "off",
         "prefer-arrow-callback": [
           "error",
           {
@@ -179,10 +139,7 @@
         "react/jsx-uses-react": "error",
         "react/jsx-uses-vars": "error",
         "react/jsx-no-undef": "error",
-        "react/jsx-fragments": [
-          "error",
-          "syntax"
-        ],
+        "react/jsx-fragments": ["error", "syntax"],
         "react/no-multi-comp": "error",
         "react-hooks/rules-of-hooks": "error",
         "react-hooks/exhaustive-deps": [
@@ -190,8 +147,7 @@
           {
             "additionalHooks": "(useComponentDidUpdate)"
           }
-        ],
-        "anti-trojan-source/no-bidi": "error"
+        ]
       },
       "env": {
         "browser": true,
@@ -200,11 +156,7 @@
       "settings": {
         "import/resolver": {
           "node": {
-            "extensions": [
-              ".js",
-              ".ts",
-              ".tsx"
-            ]
+            "extensions": [".js", ".ts", ".tsx"]
           }
         },
         "react": {
@@ -213,27 +165,15 @@
       }
     },
     {
-      "files": [
-        "**/*.stories.js",
-        "**/*.stories.jsx",
-        "**/*.stories.ts",
-        "**/*.stories.tsx"
-      ],
+      "files": ["**/*.stories.js", "**/*.stories.jsx", "**/*.stories.ts", "**/*.stories.tsx"],
       "rules": {
         "react/display-name": "off",
         "react/no-multi-comp": "off"
       }
     },
     {
-      "files": [
-        "**/*.tests.js",
-        "**/*.tests.ts",
-        "**/*.spec.ts",
-        "**/*.spec.tsx"
-      ],
-      "extends": [
-        "plugin:testing-library/react"
-      ],
+      "files": ["**/*.tests.js", "**/*.tests.ts", "**/*.spec.ts", "**/*.spec.tsx"],
+      "extends": ["plugin:testing-library/react"],
       "rules": {
         "testing-library/no-await-sync-events": "warn",
         "testing-library/no-manual-cleanup": "warn",
@@ -245,10 +185,7 @@
       }
     },
     {
-      "files": [
-        "**/*.stories.ts",
-        "**/*.stories.tsx"
-      ],
+      "files": ["**/*.stories.ts", "**/*.stories.tsx"],
       "rules": {
         "@typescript-eslint/explicit-function-return-type": "off",
         "@typescript-eslint/explicit-module-boundary-types": "off"
diff --git a/apps/meteor/client/UIKit/hooks/useUIKitHandleAction.tsx b/apps/meteor/client/UIKit/hooks/useUIKitHandleAction.tsx
index b23a0b76e22..f347f1717df 100644
--- a/apps/meteor/client/UIKit/hooks/useUIKitHandleAction.tsx
+++ b/apps/meteor/client/UIKit/hooks/useUIKitHandleAction.tsx
@@ -3,7 +3,7 @@ import { UIKitIncomingInteractionContainerType } from '@rocket.chat/apps-engine/
 // import { Banner, Icon } from '@rocket.chat/fuselage';
 // import { kitContext, UiKitBanner as renderUiKitBannerBlocks } from '@rocket.chat/fuselage-ui-kit';
 // import React, { Context, FC, useMemo } from 'react';
-import { UiKitPayload, UIKitActionEvent } from '@rocket.chat/core-typings';
+import type { UiKitPayload, UIKitActionEvent } from '@rocket.chat/core-typings';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 // import { UIKitIncomingInteractionContainerType } from '@rocket.chat/apps-engine/definition/uikit/UIKitIncomingInteractionContainer';
 
diff --git a/apps/meteor/client/UIKit/hooks/useUIKitHandleClose.tsx b/apps/meteor/client/UIKit/hooks/useUIKitHandleClose.tsx
index 5bd5838f5fc..85b5c24eb00 100644
--- a/apps/meteor/client/UIKit/hooks/useUIKitHandleClose.tsx
+++ b/apps/meteor/client/UIKit/hooks/useUIKitHandleClose.tsx
@@ -1,9 +1,9 @@
-import { UIKitInteractionType } from '@rocket.chat/apps-engine/definition/uikit';
+import type { UIKitInteractionType } from '@rocket.chat/apps-engine/definition/uikit';
 /* eslint-disable new-cap */
 // import { Banner, Icon } from '@rocket.chat/fuselage';
 // import { kitContext, UiKitBanner as renderUiKitBannerBlocks } from '@rocket.chat/fuselage-ui-kit';
 // import React, { Context, FC, useMemo } from 'react';
-import { UiKitPayload } from '@rocket.chat/core-typings';
+import type { UiKitPayload } from '@rocket.chat/core-typings';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 // import { UIKitIncomingInteractionContainerType } from '@rocket.chat/apps-engine/definition/uikit/UIKitIncomingInteractionContainer';
diff --git a/apps/meteor/client/UIKit/hooks/useUIKitStateManager.tsx b/apps/meteor/client/UIKit/hooks/useUIKitStateManager.tsx
index 8d513ee518c..2ada5f66178 100644
--- a/apps/meteor/client/UIKit/hooks/useUIKitStateManager.tsx
+++ b/apps/meteor/client/UIKit/hooks/useUIKitStateManager.tsx
@@ -1,4 +1,5 @@
-import { isErrorType, UIKitUserInteractionResult, UiKitPayload } from '@rocket.chat/core-typings';
+import type { UIKitUserInteractionResult, UiKitPayload } from '@rocket.chat/core-typings';
+import { isErrorType } from '@rocket.chat/core-typings';
 import { useSafely } from '@rocket.chat/fuselage-hooks';
 import { useEffect, useState } from 'react';
 
diff --git a/apps/meteor/client/components/AdministrationList/AdministrationList.tsx b/apps/meteor/client/components/AdministrationList/AdministrationList.tsx
index 468a78f6d93..f8ea4a0de1b 100644
--- a/apps/meteor/client/components/AdministrationList/AdministrationList.tsx
+++ b/apps/meteor/client/components/AdministrationList/AdministrationList.tsx
@@ -1,7 +1,9 @@
 import { OptionDivider } from '@rocket.chat/fuselage';
-import React, { FC, Fragment } from 'react';
+import type { FC } from 'react';
+import React, { Fragment } from 'react';
 
-import { AccountBoxItem, IAppAccountBoxItem, isAppAccountBoxItem } from '../../../app/ui-utils/client/lib/AccountBox';
+import type { AccountBoxItem, IAppAccountBoxItem } from '../../../app/ui-utils/client/lib/AccountBox';
+import { isAppAccountBoxItem } from '../../../app/ui-utils/client/lib/AccountBox';
 import AdministrationModelList from './AdministrationModelList';
 import AppsModelList from './AppsModelList';
 import AuditModelList from './AuditModelList';
diff --git a/apps/meteor/client/components/AdministrationList/AdministrationModelList.tsx b/apps/meteor/client/components/AdministrationList/AdministrationModelList.tsx
index b2f03fd3941..9b96cb755d4 100644
--- a/apps/meteor/client/components/AdministrationList/AdministrationModelList.tsx
+++ b/apps/meteor/client/components/AdministrationList/AdministrationModelList.tsx
@@ -1,11 +1,12 @@
 import { OptionTitle } from '@rocket.chat/fuselage';
 import { useTranslation, useRoute } from '@rocket.chat/ui-contexts';
 import { FlowRouter } from 'meteor/kadira:flow-router';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import { userHasAllPermission } from '../../../app/authorization/client';
 import { SideNav } from '../../../app/ui-utils/client';
-import { AccountBoxItem } from '../../../app/ui-utils/client/lib/AccountBox';
+import type { AccountBoxItem } from '../../../app/ui-utils/client/lib/AccountBox';
 import { getUpgradeTabLabel, isFullyFeature } from '../../../lib/upgradeTab';
 import { useUpgradeTabParams } from '../../views/hooks/useUpgradeTabParams';
 import Emoji from '../Emoji';
diff --git a/apps/meteor/client/components/AdministrationList/AppsModelList.tsx b/apps/meteor/client/components/AdministrationList/AppsModelList.tsx
index cb6ec49e3d3..a62468317c6 100644
--- a/apps/meteor/client/components/AdministrationList/AppsModelList.tsx
+++ b/apps/meteor/client/components/AdministrationList/AppsModelList.tsx
@@ -1,9 +1,10 @@
 import { OptionTitle } from '@rocket.chat/fuselage';
 import { useTranslation, useRoute } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { triggerActionButtonAction } from '../../../app/ui-message/client/ActionManager';
-import { IAppAccountBoxItem } from '../../../app/ui-utils/client/lib/AccountBox';
+import type { IAppAccountBoxItem } from '../../../app/ui-utils/client/lib/AccountBox';
 import ListItem from '../Sidebar/ListItem';
 
 type AppsModelListProps = {
diff --git a/apps/meteor/client/components/AdministrationList/AuditModelList.tsx b/apps/meteor/client/components/AdministrationList/AuditModelList.tsx
index 4e476e7745f..0b28a7030a3 100644
--- a/apps/meteor/client/components/AdministrationList/AuditModelList.tsx
+++ b/apps/meteor/client/components/AdministrationList/AuditModelList.tsx
@@ -1,6 +1,7 @@
 import { OptionTitle } from '@rocket.chat/fuselage';
 import { useRoute, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import ListItem from '../Sidebar/ListItem';
 
diff --git a/apps/meteor/client/components/AutoCompleteAgent.tsx b/apps/meteor/client/components/AutoCompleteAgent.tsx
index 802e3c0c149..635fca75543 100644
--- a/apps/meteor/client/components/AutoCompleteAgent.tsx
+++ b/apps/meteor/client/components/AutoCompleteAgent.tsx
@@ -1,6 +1,7 @@
 import { PaginatedSelectFiltered } from '@rocket.chat/fuselage';
 import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
-import React, { memo, ReactElement, useMemo, useState } from 'react';
+import type { ReactElement } from 'react';
+import React, { memo, useMemo, useState } from 'react';
 
 import { useRecordList } from '../hooks/lists/useRecordList';
 import { AsyncStatePhase } from '../lib/asyncState';
diff --git a/apps/meteor/client/components/AutoCompleteAgentWithoutExtension.tsx b/apps/meteor/client/components/AutoCompleteAgentWithoutExtension.tsx
index dac851d653b..62c78ef2170 100644
--- a/apps/meteor/client/components/AutoCompleteAgentWithoutExtension.tsx
+++ b/apps/meteor/client/components/AutoCompleteAgentWithoutExtension.tsx
@@ -1,7 +1,8 @@
-import { ILivechatAgent } from '@rocket.chat/core-typings';
+import type { ILivechatAgent } from '@rocket.chat/core-typings';
 import { PaginatedSelectFiltered } from '@rocket.chat/fuselage';
 import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
-import React, { FC, memo, useMemo, useState } from 'react';
+import type { FC } from 'react';
+import React, { memo, useMemo, useState } from 'react';
 
 import { useRecordList } from '../hooks/lists/useRecordList';
 import { AsyncStatePhase } from '../lib/asyncState';
diff --git a/apps/meteor/client/components/AutoCompleteDepartment.tsx b/apps/meteor/client/components/AutoCompleteDepartment.tsx
index 78cf107f13b..4bbb37b9049 100644
--- a/apps/meteor/client/components/AutoCompleteDepartment.tsx
+++ b/apps/meteor/client/components/AutoCompleteDepartment.tsx
@@ -1,7 +1,8 @@
 import { PaginatedSelectFiltered } from '@rocket.chat/fuselage';
 import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { memo, ReactElement, useMemo, useState } from 'react';
+import type { ReactElement } from 'react';
+import React, { memo, useMemo, useState } from 'react';
 
 import { useRecordList } from '../hooks/lists/useRecordList';
 import { AsyncStatePhase } from '../hooks/useAsyncState';
diff --git a/apps/meteor/client/components/Backdrop.tsx b/apps/meteor/client/components/Backdrop.tsx
index 39bbd1bcc87..666ba432f13 100644
--- a/apps/meteor/client/components/Backdrop.tsx
+++ b/apps/meteor/client/components/Backdrop.tsx
@@ -1,5 +1,6 @@
 import { Modal } from '@rocket.chat/fuselage';
-import React, { ComponentProps, ReactElement } from 'react';
+import type { ComponentProps, ReactElement } from 'react';
+import React from 'react';
 
 type BackdropProps = ComponentProps<typeof Modal.Backdrop>;
 
diff --git a/apps/meteor/client/components/BurgerMenu/BurgerBadge.stories.tsx b/apps/meteor/client/components/BurgerMenu/BurgerBadge.stories.tsx
index 0959f424933..3061911e06b 100644
--- a/apps/meteor/client/components/BurgerMenu/BurgerBadge.stories.tsx
+++ b/apps/meteor/client/components/BurgerMenu/BurgerBadge.stories.tsx
@@ -1,6 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
-import React, { ReactElement } from 'react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import BurgerBadge from './BurgerBadge';
 
diff --git a/apps/meteor/client/components/BurgerMenu/BurgerBadge.tsx b/apps/meteor/client/components/BurgerMenu/BurgerBadge.tsx
index efc029edc18..d42d2868f8c 100644
--- a/apps/meteor/client/components/BurgerMenu/BurgerBadge.tsx
+++ b/apps/meteor/client/components/BurgerMenu/BurgerBadge.tsx
@@ -1,6 +1,7 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Badge } from '@rocket.chat/fuselage';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 const BurgerBadge = ({ children }: { children?: unknown }): ReactElement => (
 	<Box
diff --git a/apps/meteor/client/components/BurgerMenu/BurgerIcon.stories.tsx b/apps/meteor/client/components/BurgerMenu/BurgerIcon.stories.tsx
index bfee5b6595e..bf6d67ac807 100644
--- a/apps/meteor/client/components/BurgerMenu/BurgerIcon.stories.tsx
+++ b/apps/meteor/client/components/BurgerMenu/BurgerIcon.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import { useAutoSequence } from '../../stories/hooks/useAutoSequence';
diff --git a/apps/meteor/client/components/BurgerMenu/BurgerIcon.tsx b/apps/meteor/client/components/BurgerMenu/BurgerIcon.tsx
index aedcdae226b..cb1ccfb06c0 100644
--- a/apps/meteor/client/components/BurgerMenu/BurgerIcon.tsx
+++ b/apps/meteor/client/components/BurgerMenu/BurgerIcon.tsx
@@ -1,5 +1,6 @@
 import { usePrefersReducedMotion } from '@rocket.chat/fuselage-hooks';
-import React, { ReactElement, ReactNode } from 'react';
+import type { ReactElement, ReactNode } from 'react';
+import React from 'react';
 
 import Line from './Line';
 import Wrapper from './Wrapper';
diff --git a/apps/meteor/client/components/BurgerMenu/BurgerMenu.tsx b/apps/meteor/client/components/BurgerMenu/BurgerMenu.tsx
index 8a873aef06d..35d156e1e3a 100644
--- a/apps/meteor/client/components/BurgerMenu/BurgerMenu.tsx
+++ b/apps/meteor/client/components/BurgerMenu/BurgerMenu.tsx
@@ -1,6 +1,7 @@
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useLayout, useSession } from '@rocket.chat/ui-contexts';
-import React, { memo, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { memo } from 'react';
 
 import { useEmbeddedLayout } from '../../hooks/useEmbeddedLayout';
 import BurgerMenuButton from './BurgerMenuButton';
diff --git a/apps/meteor/client/components/BurgerMenu/BurgerMenuButton.stories.tsx b/apps/meteor/client/components/BurgerMenu/BurgerMenuButton.stories.tsx
index 33693654e6d..3be8ea55885 100644
--- a/apps/meteor/client/components/BurgerMenu/BurgerMenuButton.stories.tsx
+++ b/apps/meteor/client/components/BurgerMenu/BurgerMenuButton.stories.tsx
@@ -1,5 +1,5 @@
 import { action } from '@storybook/addon-actions';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import { useAutoSequence } from '../../stories/hooks/useAutoSequence';
diff --git a/apps/meteor/client/components/BurgerMenu/BurgerMenuButton.tsx b/apps/meteor/client/components/BurgerMenu/BurgerMenuButton.tsx
index 6712a93fc9d..d4cc98a0d1f 100644
--- a/apps/meteor/client/components/BurgerMenu/BurgerMenuButton.tsx
+++ b/apps/meteor/client/components/BurgerMenu/BurgerMenuButton.tsx
@@ -1,7 +1,8 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import BurgerBadge from './BurgerBadge';
 import BurgerIcon from './BurgerIcon';
diff --git a/apps/meteor/client/components/BurgerMenu/Line.tsx b/apps/meteor/client/components/BurgerMenu/Line.tsx
index e1f3ef84f65..3f945f01b8d 100644
--- a/apps/meteor/client/components/BurgerMenu/Line.tsx
+++ b/apps/meteor/client/components/BurgerMenu/Line.tsx
@@ -1,6 +1,7 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box } from '@rocket.chat/fuselage';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 const Line = ({ animated, moved }: { animated: boolean; moved?: boolean }): ReactElement => {
 	const animatedStyle = animated
diff --git a/apps/meteor/client/components/BurgerMenu/Wrapper.tsx b/apps/meteor/client/components/BurgerMenu/Wrapper.tsx
index 80ceeacf0de..135e24cc7ce 100644
--- a/apps/meteor/client/components/BurgerMenu/Wrapper.tsx
+++ b/apps/meteor/client/components/BurgerMenu/Wrapper.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { ReactElement, ReactNode } from 'react';
+import type { ReactElement, ReactNode } from 'react';
+import React from 'react';
 
 const Wrapper = ({ children }: { children: ReactNode }): ReactElement => (
 	<Box
diff --git a/apps/meteor/client/components/ConfirmOwnerChangeModal.tsx b/apps/meteor/client/components/ConfirmOwnerChangeModal.tsx
index 0ba24e50f16..c18c0d75002 100644
--- a/apps/meteor/client/components/ConfirmOwnerChangeModal.tsx
+++ b/apps/meteor/client/components/ConfirmOwnerChangeModal.tsx
@@ -1,6 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, ComponentProps } from 'react';
+import type { FC, ComponentProps } from 'react';
+import React from 'react';
 
 import GenericModal from './GenericModal';
 import RawText from './RawText';
diff --git a/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx b/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx
index 1ded57c54be..a852133906d 100644
--- a/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx
+++ b/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx
@@ -2,7 +2,8 @@ import type { IMessage, IRoom, IUser } from '@rocket.chat/core-typings';
 import { Modal, Field, FieldGroup, ToggleSwitch, TextInput, TextAreaInput, Button, Icon, Box } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { useEndpointActionExperimental } from '../../hooks/useEndpointActionExperimental';
 import { useForm } from '../../hooks/useForm';
diff --git a/apps/meteor/client/components/CreateDiscussion/DefaultParentRoomField.tsx b/apps/meteor/client/components/CreateDiscussion/DefaultParentRoomField.tsx
index 3fda044a791..f8d08f95500 100644
--- a/apps/meteor/client/components/CreateDiscussion/DefaultParentRoomField.tsx
+++ b/apps/meteor/client/components/CreateDiscussion/DefaultParentRoomField.tsx
@@ -1,6 +1,7 @@
 import { Skeleton, TextInput, Callout } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useMemo, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo } from 'react';
 
 import { AsyncStatePhase } from '../../hooks/useAsyncState';
 import { useEndpointData } from '../../hooks/useEndpointData';
diff --git a/apps/meteor/client/components/Emoji.tsx b/apps/meteor/client/components/Emoji.tsx
index 61ac1045421..3dd594696ca 100644
--- a/apps/meteor/client/components/Emoji.tsx
+++ b/apps/meteor/client/components/Emoji.tsx
@@ -1,4 +1,5 @@
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { renderEmoji } from '../lib/utils/renderEmoji';
 
diff --git a/apps/meteor/client/components/FilterByText.tsx b/apps/meteor/client/components/FilterByText.tsx
index a2600c9c9d6..4635128533a 100644
--- a/apps/meteor/client/components/FilterByText.tsx
+++ b/apps/meteor/client/components/FilterByText.tsx
@@ -1,6 +1,7 @@
 import { Box, Icon, TextInput, Button } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactNode, ChangeEvent, FormEvent, memo, useCallback, useEffect, useState, ReactElement } from 'react';
+import type { ReactNode, ChangeEvent, FormEvent, ReactElement } from 'react';
+import React, { memo, useCallback, useEffect, useState } from 'react';
 
 type FilterByTextCommonProps = {
 	children?: ReactNode | undefined;
diff --git a/apps/meteor/client/components/GenericModal.stories.tsx b/apps/meteor/client/components/GenericModal.stories.tsx
index c320d52ae1c..329bdcb4e17 100644
--- a/apps/meteor/client/components/GenericModal.stories.tsx
+++ b/apps/meteor/client/components/GenericModal.stories.tsx
@@ -1,5 +1,5 @@
 import { action } from '@storybook/addon-actions';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import GenericModal, { GenericModalDoNotAskAgain } from './GenericModal';
diff --git a/apps/meteor/client/components/GenericModal.tsx b/apps/meteor/client/components/GenericModal.tsx
index d458541374e..1886bdb6eef 100644
--- a/apps/meteor/client/components/GenericModal.tsx
+++ b/apps/meteor/client/components/GenericModal.tsx
@@ -1,8 +1,11 @@
-import { Button, Icon, Modal } from '@rocket.chat/fuselage';
+import type { Icon } from '@rocket.chat/fuselage';
+import { Button, Modal } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, ComponentProps, ReactElement, ReactNode } from 'react';
+import type { FC, ComponentProps, ReactElement, ReactNode } from 'react';
+import React from 'react';
 
-import { withDoNotAskAgain, RequiredModalProps } from './withDoNotAskAgain';
+import type { RequiredModalProps } from './withDoNotAskAgain';
+import { withDoNotAskAgain } from './withDoNotAskAgain';
 
 type VariantType = 'danger' | 'warning' | 'info' | 'success';
 
diff --git a/apps/meteor/client/components/GenericTable/GenericTable.stories.tsx b/apps/meteor/client/components/GenericTable/GenericTable.stories.tsx
index 38e518e8401..3ebb67b6e09 100644
--- a/apps/meteor/client/components/GenericTable/GenericTable.stories.tsx
+++ b/apps/meteor/client/components/GenericTable/GenericTable.stories.tsx
@@ -1,5 +1,5 @@
 import { TextInput, Box, Icon, Table } from '@rocket.chat/fuselage';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import GenericTable from '.';
diff --git a/apps/meteor/client/components/GenericTable/GenericTable.tsx b/apps/meteor/client/components/GenericTable/GenericTable.tsx
index 0308795cd81..e1e3321309e 100644
--- a/apps/meteor/client/components/GenericTable/GenericTable.tsx
+++ b/apps/meteor/client/components/GenericTable/GenericTable.tsx
@@ -1,7 +1,8 @@
 import { Pagination, Tile } from '@rocket.chat/fuselage';
 import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useState, useEffect, forwardRef, ReactNode, ReactElement, Key, useMemo, Ref } from 'react';
+import type { ReactNode, ReactElement, Key, Ref } from 'react';
+import React, { useState, useEffect, forwardRef, useMemo } from 'react';
 import flattenChildren from 'react-keyed-flatten-children';
 
 import { GenericTable as GenericTableV2 } from './V2/GenericTable';
@@ -43,7 +44,7 @@ const GenericTable = forwardRef(function GenericTable<
 		params: paramsDefault = defaultParamsValue,
 		setParams = defaultSetParamsValue,
 		renderFilter,
-		renderRow: RenderRow,
+		renderRow: RenderRowComponent,
 		results,
 		total,
 		pagination = true,
@@ -83,7 +84,8 @@ const GenericTable = forwardRef(function GenericTable<
 						<GenericTableBody>
 							{isLoading && <GenericTableLoadingTable headerCells={headerCells} />}
 							{!isLoading &&
-								((RenderRow && results?.map((props, index) => <RenderRow key={'_id' in props ? props._id : index} {...props} />)) ||
+								((RenderRowComponent &&
+									results?.map((props, index) => <RenderRowComponent key={'_id' in props ? props._id : index} {...props} />)) ||
 									(children && results?.map(children)))}
 						</GenericTableBody>
 					</GenericTableV2>
diff --git a/apps/meteor/client/components/GenericTable/HeaderCell.tsx b/apps/meteor/client/components/GenericTable/HeaderCell.tsx
index bf10cb99ff9..22ee663792e 100644
--- a/apps/meteor/client/components/GenericTable/HeaderCell.tsx
+++ b/apps/meteor/client/components/GenericTable/HeaderCell.tsx
@@ -1,5 +1,6 @@
 import { Box, Table } from '@rocket.chat/fuselage';
-import React, { ComponentProps, FC, useCallback } from 'react';
+import type { ComponentProps, FC } from 'react';
+import React, { useCallback } from 'react';
 
 import SortIcon from './SortIcon';
 
diff --git a/apps/meteor/client/components/GenericTable/NoResults.tsx b/apps/meteor/client/components/GenericTable/NoResults.tsx
index 698f427926a..f2a1cdf6f41 100644
--- a/apps/meteor/client/components/GenericTable/NoResults.tsx
+++ b/apps/meteor/client/components/GenericTable/NoResults.tsx
@@ -1,5 +1,6 @@
 import { Box, Tile, Button, Icon } from '@rocket.chat/fuselage';
-import React, { ComponentProps, FC } from 'react';
+import type { ComponentProps, FC } from 'react';
+import React from 'react';
 
 type NoResultsProps = {
 	icon: ComponentProps<typeof Icon>['name'];
diff --git a/apps/meteor/client/components/GenericTable/SortIcon.tsx b/apps/meteor/client/components/GenericTable/SortIcon.tsx
index 5651e236caf..a3e138c54c5 100644
--- a/apps/meteor/client/components/GenericTable/SortIcon.tsx
+++ b/apps/meteor/client/components/GenericTable/SortIcon.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 type SortIconProps = {
 	direction?: 'asc' | 'desc';
diff --git a/apps/meteor/client/components/GenericTable/V2/GenericTable.tsx b/apps/meteor/client/components/GenericTable/V2/GenericTable.tsx
index 74c055c4732..c4c690674bc 100644
--- a/apps/meteor/client/components/GenericTable/V2/GenericTable.tsx
+++ b/apps/meteor/client/components/GenericTable/V2/GenericTable.tsx
@@ -1,5 +1,6 @@
 import { Box, Table } from '@rocket.chat/fuselage';
-import React, { forwardRef, ReactNode } from 'react';
+import type { ReactNode } from 'react';
+import React, { forwardRef } from 'react';
 
 import ScrollableContentWrapper from '../../ScrollableContentWrapper';
 
diff --git a/apps/meteor/client/components/GenericTable/V2/GenericTableBody.tsx b/apps/meteor/client/components/GenericTable/V2/GenericTableBody.tsx
index 945688f9efa..af57242bbc9 100644
--- a/apps/meteor/client/components/GenericTable/V2/GenericTableBody.tsx
+++ b/apps/meteor/client/components/GenericTable/V2/GenericTableBody.tsx
@@ -1,4 +1,5 @@
 import { Table } from '@rocket.chat/fuselage';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 export const GenericTableBody: FC = (props) => <Table.Body {...props} />;
diff --git a/apps/meteor/client/components/GenericTable/V2/GenericTableCell.tsx b/apps/meteor/client/components/GenericTable/V2/GenericTableCell.tsx
index da8e425eee5..8558920c54c 100644
--- a/apps/meteor/client/components/GenericTable/V2/GenericTableCell.tsx
+++ b/apps/meteor/client/components/GenericTable/V2/GenericTableCell.tsx
@@ -1,4 +1,5 @@
 import { Table } from '@rocket.chat/fuselage';
-import React, { ComponentProps, FC } from 'react';
+import type { ComponentProps, FC } from 'react';
+import React from 'react';
 
 export const GenericTableCell: FC<ComponentProps<typeof Table.Cell>> = (props) => <Table.Cell {...props} />;
diff --git a/apps/meteor/client/components/GenericTable/V2/GenericTableHeader.tsx b/apps/meteor/client/components/GenericTable/V2/GenericTableHeader.tsx
index 90f3a340f5a..847f32232d8 100644
--- a/apps/meteor/client/components/GenericTable/V2/GenericTableHeader.tsx
+++ b/apps/meteor/client/components/GenericTable/V2/GenericTableHeader.tsx
@@ -1,5 +1,6 @@
 import { Table } from '@rocket.chat/fuselage';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import { GenericTableRow } from './GenericTableRow';
 
diff --git a/apps/meteor/client/components/GenericTable/V2/GenericTableHeaderCell.tsx b/apps/meteor/client/components/GenericTable/V2/GenericTableHeaderCell.tsx
index a4db4fbb316..5127d38a834 100644
--- a/apps/meteor/client/components/GenericTable/V2/GenericTableHeaderCell.tsx
+++ b/apps/meteor/client/components/GenericTable/V2/GenericTableHeaderCell.tsx
@@ -1,5 +1,6 @@
 import { Box, Table } from '@rocket.chat/fuselage';
-import React, { ComponentProps, ReactElement, useCallback } from 'react';
+import type { ComponentProps, ReactElement } from 'react';
+import React, { useCallback } from 'react';
 
 import SortIcon from '../SortIcon';
 
diff --git a/apps/meteor/client/components/GenericTable/V2/GenericTableLoadingRow.tsx b/apps/meteor/client/components/GenericTable/V2/GenericTableLoadingRow.tsx
index ecc34e2e5e7..c0aee3d68cc 100644
--- a/apps/meteor/client/components/GenericTable/V2/GenericTableLoadingRow.tsx
+++ b/apps/meteor/client/components/GenericTable/V2/GenericTableLoadingRow.tsx
@@ -1,5 +1,6 @@
 import { Box, Skeleton, Table } from '@rocket.chat/fuselage';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 type GenericTableLoadingRowRowProps = {
 	cols: number;
diff --git a/apps/meteor/client/components/GenericTable/V2/GenericTableLoadingTable.tsx b/apps/meteor/client/components/GenericTable/V2/GenericTableLoadingTable.tsx
index fe0e5b0a43f..214380bd304 100644
--- a/apps/meteor/client/components/GenericTable/V2/GenericTableLoadingTable.tsx
+++ b/apps/meteor/client/components/GenericTable/V2/GenericTableLoadingTable.tsx
@@ -1,4 +1,5 @@
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { GenericTableLoadingRow } from './GenericTableLoadingRow';
 
diff --git a/apps/meteor/client/components/GenericTable/V2/GenericTableRow.tsx b/apps/meteor/client/components/GenericTable/V2/GenericTableRow.tsx
index 2390a4766ba..56267adfb15 100644
--- a/apps/meteor/client/components/GenericTable/V2/GenericTableRow.tsx
+++ b/apps/meteor/client/components/GenericTable/V2/GenericTableRow.tsx
@@ -1,4 +1,5 @@
 import { Table } from '@rocket.chat/fuselage';
-import React, { ComponentProps, FC } from 'react';
+import type { ComponentProps, FC } from 'react';
+import React from 'react';
 
 export const GenericTableRow: FC<ComponentProps<typeof Table.Row>> = (props) => <Table.Row {...props} />;
diff --git a/apps/meteor/client/components/GenericTable/hooks/useShowingResultsLabel.ts b/apps/meteor/client/components/GenericTable/hooks/useShowingResultsLabel.ts
index 4a4e2b3c023..c610340f28b 100644
--- a/apps/meteor/client/components/GenericTable/hooks/useShowingResultsLabel.ts
+++ b/apps/meteor/client/components/GenericTable/hooks/useShowingResultsLabel.ts
@@ -1,6 +1,7 @@
-import { Pagination } from '@rocket.chat/fuselage';
+import type { Pagination } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import { ComponentProps, useCallback } from 'react';
+import type { ComponentProps } from 'react';
+import { useCallback } from 'react';
 
 type Props<T extends ComponentProps<typeof Pagination>['showingResultsLabel'] = ComponentProps<typeof Pagination>['showingResultsLabel']> =
 	T extends (...args: any[]) => any ? Parameters<T> : never;
diff --git a/apps/meteor/client/components/InfoPanel/InfoPanel.stories.tsx b/apps/meteor/client/components/InfoPanel/InfoPanel.stories.tsx
index 37ae78d322d..d49972df801 100644
--- a/apps/meteor/client/components/InfoPanel/InfoPanel.stories.tsx
+++ b/apps/meteor/client/components/InfoPanel/InfoPanel.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import InfoPanel from '.';
diff --git a/apps/meteor/client/components/InfoPanel/InfoPanel.tsx b/apps/meteor/client/components/InfoPanel/InfoPanel.tsx
index 69e73d5e083..6e3fe6c0093 100644
--- a/apps/meteor/client/components/InfoPanel/InfoPanel.tsx
+++ b/apps/meteor/client/components/InfoPanel/InfoPanel.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 const InfoPanel: FC = ({ children }) => (
 	<Box flexGrow={1} mb='neg-x24'>
diff --git a/apps/meteor/client/components/InfoPanel/InfoPanelAction.tsx b/apps/meteor/client/components/InfoPanel/InfoPanelAction.tsx
index d941fa3a978..50943cfa4ce 100644
--- a/apps/meteor/client/components/InfoPanel/InfoPanelAction.tsx
+++ b/apps/meteor/client/components/InfoPanel/InfoPanelAction.tsx
@@ -1,5 +1,6 @@
 import { Icon, Button } from '@rocket.chat/fuselage';
-import React, { ComponentProps, FC } from 'react';
+import type { ComponentProps, FC } from 'react';
+import React from 'react';
 
 const InfoPanelAction: FC<ComponentProps<typeof Button> & { icon: ComponentProps<typeof Icon>['name']; label: string }> = ({
 	label,
diff --git a/apps/meteor/client/components/InfoPanel/InfoPanelActionGroup.tsx b/apps/meteor/client/components/InfoPanel/InfoPanelActionGroup.tsx
index 4a08d90623b..e8aa992a5dc 100644
--- a/apps/meteor/client/components/InfoPanel/InfoPanelActionGroup.tsx
+++ b/apps/meteor/client/components/InfoPanel/InfoPanelActionGroup.tsx
@@ -1,5 +1,6 @@
 import { ButtonGroup } from '@rocket.chat/fuselage';
-import React, { ComponentProps, FC } from 'react';
+import type { ComponentProps, FC } from 'react';
+import React from 'react';
 
 import Section from './InfoPanelSection';
 
diff --git a/apps/meteor/client/components/InfoPanel/InfoPanelAvatar.tsx b/apps/meteor/client/components/InfoPanel/InfoPanelAvatar.tsx
index bd5b547b3ee..2e4f3660131 100644
--- a/apps/meteor/client/components/InfoPanel/InfoPanelAvatar.tsx
+++ b/apps/meteor/client/components/InfoPanel/InfoPanelAvatar.tsx
@@ -1,4 +1,5 @@
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import Section from './InfoPanelSection';
 
diff --git a/apps/meteor/client/components/InfoPanel/InfoPanelField.tsx b/apps/meteor/client/components/InfoPanel/InfoPanelField.tsx
index 4eaa93b7e32..0ec4f7030b6 100644
--- a/apps/meteor/client/components/InfoPanel/InfoPanelField.tsx
+++ b/apps/meteor/client/components/InfoPanel/InfoPanelField.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 const InfoPanelField: FC = ({ children }) => <Box mb='x16'>{children}</Box>;
 
diff --git a/apps/meteor/client/components/InfoPanel/InfoPanelLabel.tsx b/apps/meteor/client/components/InfoPanel/InfoPanelLabel.tsx
index e3907262bcb..5bd09c56191 100644
--- a/apps/meteor/client/components/InfoPanel/InfoPanelLabel.tsx
+++ b/apps/meteor/client/components/InfoPanel/InfoPanelLabel.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { ComponentProps, FC } from 'react';
+import type { ComponentProps, FC } from 'react';
+import React from 'react';
 
 const InfoPanelLabel: FC<ComponentProps<typeof Box>> = (props) => <Box mb='x8' fontScale='p2m' color='default' {...props} />;
 
diff --git a/apps/meteor/client/components/InfoPanel/InfoPanelSection.tsx b/apps/meteor/client/components/InfoPanel/InfoPanelSection.tsx
index 53af7847894..78b0a7b0202 100644
--- a/apps/meteor/client/components/InfoPanel/InfoPanelSection.tsx
+++ b/apps/meteor/client/components/InfoPanel/InfoPanelSection.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { ComponentProps, FC } from 'react';
+import type { ComponentProps, FC } from 'react';
+import React from 'react';
 
 const InfoPanelSection: FC<ComponentProps<typeof Box>> = (props) => <Box mb='x24' {...props} />;
 
diff --git a/apps/meteor/client/components/InfoPanel/InfoPanelText.tsx b/apps/meteor/client/components/InfoPanel/InfoPanelText.tsx
index fd483f2dc7a..50e4c4d8246 100644
--- a/apps/meteor/client/components/InfoPanel/InfoPanelText.tsx
+++ b/apps/meteor/client/components/InfoPanel/InfoPanelText.tsx
@@ -1,6 +1,7 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box } from '@rocket.chat/fuselage';
-import React, { ComponentProps, FC } from 'react';
+import type { ComponentProps, FC } from 'react';
+import React from 'react';
 
 const wordBreak = css`
 	word-break: break-word;
diff --git a/apps/meteor/client/components/InfoPanel/InfoPanelTitle.tsx b/apps/meteor/client/components/InfoPanel/InfoPanelTitle.tsx
index c5fb7bcb727..bab4bf530c1 100644
--- a/apps/meteor/client/components/InfoPanel/InfoPanelTitle.tsx
+++ b/apps/meteor/client/components/InfoPanel/InfoPanelTitle.tsx
@@ -1,5 +1,6 @@
 import { Box, Icon } from '@rocket.chat/fuselage';
-import React, { ComponentProps, FC, ReactNode } from 'react';
+import type { ComponentProps, FC, ReactNode } from 'react';
+import React from 'react';
 
 type InfoPanelTitleProps = {
 	title: string;
diff --git a/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.tsx b/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.tsx
index fa334c109a2..9e261c88af7 100644
--- a/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.tsx
+++ b/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.tsx
@@ -1,6 +1,7 @@
 import { Callout } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import { useFormattedRelativeTime } from '../../hooks/useFormattedRelativeTime';
 
diff --git a/apps/meteor/client/components/LocalTime.tsx b/apps/meteor/client/components/LocalTime.tsx
index d4953717e01..100ba2ec6a6 100644
--- a/apps/meteor/client/components/LocalTime.tsx
+++ b/apps/meteor/client/components/LocalTime.tsx
@@ -1,5 +1,6 @@
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { memo, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { memo } from 'react';
 
 import { useUTCClock } from '../hooks/useUTCClock';
 
diff --git a/apps/meteor/client/components/MarkdownText.stories.tsx b/apps/meteor/client/components/MarkdownText.stories.tsx
index 9f9f3da0871..3112e056d2a 100644
--- a/apps/meteor/client/components/MarkdownText.stories.tsx
+++ b/apps/meteor/client/components/MarkdownText.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import outdent from 'outdent';
 import React from 'react';
 
diff --git a/apps/meteor/client/components/MarkdownText.tsx b/apps/meteor/client/components/MarkdownText.tsx
index 21e3fce2c7a..191f72c8d69 100644
--- a/apps/meteor/client/components/MarkdownText.tsx
+++ b/apps/meteor/client/components/MarkdownText.tsx
@@ -2,7 +2,8 @@ import { Box } from '@rocket.chat/fuselage';
 import { useSetting } from '@rocket.chat/ui-contexts';
 import dompurify from 'dompurify';
 import { marked } from 'marked';
-import React, { ComponentProps, FC, useMemo } from 'react';
+import type { ComponentProps, FC } from 'react';
+import React, { useMemo } from 'react';
 
 import { renderMessageEmoji } from '../lib/utils/renderMessageEmoji';
 
diff --git a/apps/meteor/client/components/Omnichannel/Skeleton.tsx b/apps/meteor/client/components/Omnichannel/Skeleton.tsx
index 99c63164a70..0afb367fc89 100644
--- a/apps/meteor/client/components/Omnichannel/Skeleton.tsx
+++ b/apps/meteor/client/components/Omnichannel/Skeleton.tsx
@@ -1,5 +1,6 @@
 import { Box, Skeleton } from '@rocket.chat/fuselage';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 export const FormSkeleton: FC = (props) => (
 	<Box w='full' pb='x24' {...props}>
diff --git a/apps/meteor/client/components/Omnichannel/Tags.tsx b/apps/meteor/client/components/Omnichannel/Tags.tsx
index 14c740690d7..f0c18d5b502 100644
--- a/apps/meteor/client/components/Omnichannel/Tags.tsx
+++ b/apps/meteor/client/components/Omnichannel/Tags.tsx
@@ -1,7 +1,8 @@
 import { Field, TextInput, Chip, Button } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ChangeEvent, ReactElement, useState } from 'react';
+import type { ChangeEvent, ReactElement } from 'react';
+import React, { useState } from 'react';
 
 import { AsyncStatePhase } from '../../hooks/useAsyncState';
 import { useEndpointData } from '../../hooks/useEndpointData';
diff --git a/apps/meteor/client/components/Omnichannel/modals/CloseChatModal.tsx b/apps/meteor/client/components/Omnichannel/modals/CloseChatModal.tsx
index 2348f901d05..b6bdc36e86c 100644
--- a/apps/meteor/client/components/Omnichannel/modals/CloseChatModal.tsx
+++ b/apps/meteor/client/components/Omnichannel/modals/CloseChatModal.tsx
@@ -1,7 +1,8 @@
-import { ILivechatDepartment } from '@rocket.chat/core-typings';
+import type { ILivechatDepartment } from '@rocket.chat/core-typings';
 import { Field, Button, TextInput, Modal, Box } from '@rocket.chat/fuselage';
 import { useSetting, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useCallback, useState, useEffect, ReactElement, useMemo } from 'react';
+import type { ReactElement } from 'react';
+import React, { useCallback, useState, useEffect, useMemo } from 'react';
 import { useForm } from 'react-hook-form';
 
 import GenericModal from '../../GenericModal';
diff --git a/apps/meteor/client/components/Omnichannel/modals/CloseChatModalData.tsx b/apps/meteor/client/components/Omnichannel/modals/CloseChatModalData.tsx
index ae1314a006f..40c4e21f6b1 100644
--- a/apps/meteor/client/components/Omnichannel/modals/CloseChatModalData.tsx
+++ b/apps/meteor/client/components/Omnichannel/modals/CloseChatModalData.tsx
@@ -1,5 +1,6 @@
-import { ILivechatDepartment, ILivechatDepartmentAgents } from '@rocket.chat/core-typings';
-import React, { ReactElement } from 'react';
+import type { ILivechatDepartment, ILivechatDepartmentAgents } from '@rocket.chat/core-typings';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { AsyncStatePhase } from '../../../hooks/useAsyncState';
 import { useEndpointData } from '../../../hooks/useEndpointData';
diff --git a/apps/meteor/client/components/Omnichannel/modals/ForwardChatModal.tsx b/apps/meteor/client/components/Omnichannel/modals/ForwardChatModal.tsx
index b59a65676eb..3d3ef65a6da 100644
--- a/apps/meteor/client/components/Omnichannel/modals/ForwardChatModal.tsx
+++ b/apps/meteor/client/components/Omnichannel/modals/ForwardChatModal.tsx
@@ -1,8 +1,9 @@
-import { IOmnichannelRoom } from '@rocket.chat/core-typings';
+import type { IOmnichannelRoom } from '@rocket.chat/core-typings';
 import { Field, Button, TextAreaInput, Modal, Box, PaginatedSelectFiltered } from '@rocket.chat/fuselage';
 import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
 import { useEndpoint, useSetting, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useCallback, useEffect, useMemo, useState } from 'react';
+import type { ReactElement } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { useForm } from 'react-hook-form';
 
 import { useRecordList } from '../../../hooks/lists/useRecordList';
diff --git a/apps/meteor/client/components/Omnichannel/modals/ModalSeparator/ModalSeparator.tsx b/apps/meteor/client/components/Omnichannel/modals/ModalSeparator/ModalSeparator.tsx
index 029114f4205..da6e47ef649 100644
--- a/apps/meteor/client/components/Omnichannel/modals/ModalSeparator/ModalSeparator.tsx
+++ b/apps/meteor/client/components/Omnichannel/modals/ModalSeparator/ModalSeparator.tsx
@@ -1,4 +1,5 @@
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import './style.css';
 
diff --git a/apps/meteor/client/components/Omnichannel/modals/ReturnChatQueueModal.tsx b/apps/meteor/client/components/Omnichannel/modals/ReturnChatQueueModal.tsx
index 5dbb3e2b24f..476368aed97 100644
--- a/apps/meteor/client/components/Omnichannel/modals/ReturnChatQueueModal.tsx
+++ b/apps/meteor/client/components/Omnichannel/modals/ReturnChatQueueModal.tsx
@@ -1,6 +1,7 @@
 import { Button, Modal } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 type ReturnChatQueueModalProps = {
 	onMoveChat: () => void;
diff --git a/apps/meteor/client/components/Omnichannel/modals/TranscriptModal.tsx b/apps/meteor/client/components/Omnichannel/modals/TranscriptModal.tsx
index 68452cd4826..006f654973a 100644
--- a/apps/meteor/client/components/Omnichannel/modals/TranscriptModal.tsx
+++ b/apps/meteor/client/components/Omnichannel/modals/TranscriptModal.tsx
@@ -2,7 +2,8 @@ import type { IOmnichannelRoom } from '@rocket.chat/core-typings';
 import { Field, Button, TextInput, Modal } from '@rocket.chat/fuselage';
 import { useAutoFocus } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, useCallback, useEffect, useState, useMemo } from 'react';
+import type { FC } from 'react';
+import React, { useCallback, useEffect, useState, useMemo } from 'react';
 
 import { useComponentDidUpdate } from '../../../hooks/useComponentDidUpdate';
 import { useForm } from '../../../hooks/useForm';
diff --git a/apps/meteor/client/components/Page/Page.stories.tsx b/apps/meteor/client/components/Page/Page.stories.tsx
index 394db1817a4..a3e62140fc2 100644
--- a/apps/meteor/client/components/Page/Page.stories.tsx
+++ b/apps/meteor/client/components/Page/Page.stories.tsx
@@ -1,5 +1,5 @@
 import { Box, Button, ButtonGroup } from '@rocket.chat/fuselage';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import Page from '.';
diff --git a/apps/meteor/client/components/Page/Page.tsx b/apps/meteor/client/components/Page/Page.tsx
index 4fc848a649d..7d29477d669 100644
--- a/apps/meteor/client/components/Page/Page.tsx
+++ b/apps/meteor/client/components/Page/Page.tsx
@@ -1,6 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
 import Colors from '@rocket.chat/fuselage-tokens/colors';
-import React, { useState, ReactElement, ComponentProps } from 'react';
+import type { ReactElement, ComponentProps } from 'react';
+import React, { useState } from 'react';
 
 import PageContext from './PageContext';
 
diff --git a/apps/meteor/client/components/Page/PageBlockWithBorder.tsx b/apps/meteor/client/components/Page/PageBlockWithBorder.tsx
index bb6ee5327e1..0a48b96f1a9 100644
--- a/apps/meteor/client/components/Page/PageBlockWithBorder.tsx
+++ b/apps/meteor/client/components/Page/PageBlockWithBorder.tsx
@@ -1,5 +1,6 @@
-import { Box } from '@rocket.chat/fuselage';
-import React, { ComponentProps, forwardRef, useContext } from 'react';
+import type { Box } from '@rocket.chat/fuselage';
+import type { ComponentProps } from 'react';
+import React, { forwardRef, useContext } from 'react';
 
 import PageContent from './PageContent';
 import PageContext from './PageContext';
diff --git a/apps/meteor/client/components/Page/PageContent.tsx b/apps/meteor/client/components/Page/PageContent.tsx
index 34a448e5e9c..24ee02a0406 100644
--- a/apps/meteor/client/components/Page/PageContent.tsx
+++ b/apps/meteor/client/components/Page/PageContent.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { ComponentProps, forwardRef } from 'react';
+import type { ComponentProps } from 'react';
+import React, { forwardRef } from 'react';
 
 const PageContent = forwardRef<HTMLElement, ComponentProps<typeof Box>>(function PageContent(props, ref) {
 	return <Box ref={ref} paddingInline='x24' display='flex' flexDirection='column' overflowY='hidden' height='full' {...props} />;
diff --git a/apps/meteor/client/components/Page/PageContext.ts b/apps/meteor/client/components/Page/PageContext.ts
index 8a676b46181..b08b9efd5db 100644
--- a/apps/meteor/client/components/Page/PageContext.ts
+++ b/apps/meteor/client/components/Page/PageContext.ts
@@ -1,4 +1,5 @@
-import { createContext, Dispatch, SetStateAction } from 'react';
+import type { Dispatch, SetStateAction } from 'react';
+import { createContext } from 'react';
 
 type PageContextValue = [boolean, Dispatch<SetStateAction<boolean>>];
 
diff --git a/apps/meteor/client/components/Page/PageHeader.tsx b/apps/meteor/client/components/Page/PageHeader.tsx
index 5f3268df910..416cba91338 100644
--- a/apps/meteor/client/components/Page/PageHeader.tsx
+++ b/apps/meteor/client/components/Page/PageHeader.tsx
@@ -1,7 +1,8 @@
 import { Box, IconButton } from '@rocket.chat/fuselage';
 import { Header as TemplateHeader } from '@rocket.chat/ui-client';
 import { useLayout, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useContext, FC, ComponentProps, ReactNode } from 'react';
+import type { FC, ComponentProps, ReactNode } from 'react';
+import React, { useContext } from 'react';
 
 import BurgerMenu from '../BurgerMenu';
 import PageContext from './PageContext';
diff --git a/apps/meteor/client/components/Page/PageScrollableContent.tsx b/apps/meteor/client/components/Page/PageScrollableContent.tsx
index b03b5249c8e..0bd954864d2 100644
--- a/apps/meteor/client/components/Page/PageScrollableContent.tsx
+++ b/apps/meteor/client/components/Page/PageScrollableContent.tsx
@@ -1,7 +1,10 @@
-import { Box, Scrollable } from '@rocket.chat/fuselage';
-import React, { forwardRef, ComponentProps } from 'react';
+import type { Scrollable } from '@rocket.chat/fuselage';
+import { Box } from '@rocket.chat/fuselage';
+import type { ComponentProps } from 'react';
+import React, { forwardRef } from 'react';
 
-import ScrollableContentWrapper, { CustomScrollbarsProps } from '../ScrollableContentWrapper';
+import type { CustomScrollbarsProps } from '../ScrollableContentWrapper';
+import ScrollableContentWrapper from '../ScrollableContentWrapper';
 
 type PageScrollableContentProps = {
 	onScrollContent?: ComponentProps<typeof Scrollable>['onScrollContent'];
diff --git a/apps/meteor/client/components/Page/PageScrollableContentWithShadow.tsx b/apps/meteor/client/components/Page/PageScrollableContentWithShadow.tsx
index d9ba680c3ea..56590309cac 100644
--- a/apps/meteor/client/components/Page/PageScrollableContentWithShadow.tsx
+++ b/apps/meteor/client/components/Page/PageScrollableContentWithShadow.tsx
@@ -1,4 +1,5 @@
-import React, { useContext, FC, ComponentProps } from 'react';
+import type { FC, ComponentProps } from 'react';
+import React, { useContext } from 'react';
 
 import PageContext from './PageContext';
 import PageScrollableContent from './PageScrollableContent';
diff --git a/apps/meteor/client/components/PageSkeleton.tsx b/apps/meteor/client/components/PageSkeleton.tsx
index e3d25e9f91b..3cf519088ee 100644
--- a/apps/meteor/client/components/PageSkeleton.tsx
+++ b/apps/meteor/client/components/PageSkeleton.tsx
@@ -1,5 +1,6 @@
 import { Box, Button, ButtonGroup, Skeleton } from '@rocket.chat/fuselage';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import Page from './Page';
 
diff --git a/apps/meteor/client/components/PlanTag.tsx b/apps/meteor/client/components/PlanTag.tsx
index 74867244794..7e3f120b69d 100644
--- a/apps/meteor/client/components/PlanTag.tsx
+++ b/apps/meteor/client/components/PlanTag.tsx
@@ -1,5 +1,6 @@
 import { Box, Tag } from '@rocket.chat/fuselage';
-import React, { ReactElement, useEffect, useState } from 'react';
+import type { ReactElement } from 'react';
+import React, { useEffect, useState } from 'react';
 
 import { isTruthy } from '../../lib/isTruthy';
 import { useIsEnterprise } from '../hooks/useIsEnterprise';
diff --git a/apps/meteor/client/components/RawText.tsx b/apps/meteor/client/components/RawText.tsx
index ba643dc48eb..64b9a77b51d 100644
--- a/apps/meteor/client/components/RawText.tsx
+++ b/apps/meteor/client/components/RawText.tsx
@@ -1,4 +1,5 @@
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 // @deprecated
 const RawText = ({ children }: { children: string }): ReactElement => <span dangerouslySetInnerHTML={{ __html: children }} />;
diff --git a/apps/meteor/client/components/RoomAutoComplete/Avatar.tsx b/apps/meteor/client/components/RoomAutoComplete/Avatar.tsx
index 49041e23d82..d2854642851 100644
--- a/apps/meteor/client/components/RoomAutoComplete/Avatar.tsx
+++ b/apps/meteor/client/components/RoomAutoComplete/Avatar.tsx
@@ -1,5 +1,6 @@
 import { Options } from '@rocket.chat/fuselage';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import RoomAvatar from '../avatar/RoomAvatar';
 
diff --git a/apps/meteor/client/components/RoomAutoComplete/RoomAutoComplete.tsx b/apps/meteor/client/components/RoomAutoComplete/RoomAutoComplete.tsx
index 9b5b43af8ce..e59ac01a4ab 100644
--- a/apps/meteor/client/components/RoomAutoComplete/RoomAutoComplete.tsx
+++ b/apps/meteor/client/components/RoomAutoComplete/RoomAutoComplete.tsx
@@ -1,5 +1,6 @@
 import { AutoComplete, Option, Box } from '@rocket.chat/fuselage';
-import React, { memo, useMemo, useState, ReactElement, ComponentProps } from 'react';
+import type { ReactElement, ComponentProps } from 'react';
+import React, { memo, useMemo, useState } from 'react';
 
 import { useEndpointData } from '../../hooks/useEndpointData';
 import RoomAvatar from '../avatar/RoomAvatar';
diff --git a/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/OmnichannelAppSourceRoomIcon.tsx b/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/OmnichannelAppSourceRoomIcon.tsx
index b078b469ff9..83d781bdadd 100644
--- a/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/OmnichannelAppSourceRoomIcon.tsx
+++ b/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/OmnichannelAppSourceRoomIcon.tsx
@@ -1,6 +1,7 @@
 import type { IOmnichannelRoomFromAppSource } from '@rocket.chat/core-typings';
 import { Icon, Box } from '@rocket.chat/fuselage';
-import React, { ComponentProps, ReactElement } from 'react';
+import type { ComponentProps, ReactElement } from 'react';
+import React from 'react';
 
 import { AsyncStatePhase } from '../../../lib/asyncState/AsyncStatePhase';
 import { useOmnichannelRoomIcon } from './context/OmnichannelRoomIconContext';
diff --git a/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/OmnichannelCoreSourceRoomIcon.tsx b/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/OmnichannelCoreSourceRoomIcon.tsx
index 34f43a3406c..1f24ef49e45 100644
--- a/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/OmnichannelCoreSourceRoomIcon.tsx
+++ b/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/OmnichannelCoreSourceRoomIcon.tsx
@@ -1,6 +1,7 @@
 import type { IOmnichannelRoom } from '@rocket.chat/core-typings';
 import { Icon } from '@rocket.chat/fuselage';
-import React, { ComponentProps, ReactElement } from 'react';
+import type { ComponentProps, ReactElement } from 'react';
+import React from 'react';
 
 const colors = {
 	busy: 'danger-500',
diff --git a/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/OmnichannelRoomIcon.tsx b/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/OmnichannelRoomIcon.tsx
index ca18a38661e..5542d7bf233 100644
--- a/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/OmnichannelRoomIcon.tsx
+++ b/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/OmnichannelRoomIcon.tsx
@@ -1,6 +1,8 @@
-import { IOmnichannelRoom, isOmnichannelRoomFromAppSource } from '@rocket.chat/core-typings';
-import { Icon } from '@rocket.chat/fuselage';
-import React, { ComponentProps, ReactElement } from 'react';
+import type { IOmnichannelRoom } from '@rocket.chat/core-typings';
+import { isOmnichannelRoomFromAppSource } from '@rocket.chat/core-typings';
+import type { Icon } from '@rocket.chat/fuselage';
+import type { ComponentProps, ReactElement } from 'react';
+import React from 'react';
 
 import { OmnichannelAppSourceRoomIcon } from './OmnichannelAppSourceRoomIcon';
 import { OmnichannelCoreSourceRoomIcon } from './OmnichannelCoreSourceRoomIcon';
diff --git a/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/context/OmnichannelRoomIconContext.tsx b/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/context/OmnichannelRoomIconContext.tsx
index b51a962d8e9..5708dee33bd 100644
--- a/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/context/OmnichannelRoomIconContext.tsx
+++ b/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/context/OmnichannelRoomIconContext.tsx
@@ -1,7 +1,7 @@
 import { createContext, useMemo, useContext } from 'react';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
 
-import { AsyncState } from '../../../../lib/asyncState/AsyncState';
+import type { AsyncState } from '../../../../lib/asyncState/AsyncState';
 import { AsyncStatePhase } from '../../../../lib/asyncState/AsyncStatePhase';
 
 type IOmnichannelRoomIconContext = {
diff --git a/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/provider/OmnichannelRoomIconProvider.tsx b/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/provider/OmnichannelRoomIconProvider.tsx
index 030ca08276c..5ee2fef76b4 100644
--- a/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/provider/OmnichannelRoomIconProvider.tsx
+++ b/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/provider/OmnichannelRoomIconProvider.tsx
@@ -1,8 +1,9 @@
-import React, { FC, useCallback, useMemo } from 'react';
+import type { FC } from 'react';
+import React, { useCallback, useMemo } from 'react';
 import { createPortal } from 'react-dom';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
 
-import { AsyncState } from '../../../../lib/asyncState/AsyncState';
+import type { AsyncState } from '../../../../lib/asyncState/AsyncState';
 import { AsyncStatePhase } from '../../../../lib/asyncState/AsyncStatePhase';
 import { OmnichannelRoomIconContext } from '../context/OmnichannelRoomIconContext';
 import OmnichannelRoomIcon from '../lib/OmnichannelRoomIcon';
diff --git a/apps/meteor/client/components/RoomIcon/RoomIcon.tsx b/apps/meteor/client/components/RoomIcon/RoomIcon.tsx
index 7c8dd1f4b4c..3410fedc06c 100644
--- a/apps/meteor/client/components/RoomIcon/RoomIcon.tsx
+++ b/apps/meteor/client/components/RoomIcon/RoomIcon.tsx
@@ -1,6 +1,8 @@
-import { IRoom, isOmnichannelRoom } from '@rocket.chat/core-typings';
+import type { IRoom } from '@rocket.chat/core-typings';
+import { isOmnichannelRoom } from '@rocket.chat/core-typings';
 import { Icon } from '@rocket.chat/fuselage';
-import React, { ComponentProps, ReactElement, isValidElement } from 'react';
+import type { ComponentProps, ReactElement } from 'react';
+import React, { isValidElement } from 'react';
 
 import { useRoomIcon } from '../../hooks/useRoomIcon';
 import { OmnichannelRoomIcon } from './OmnichannelRoomIcon';
diff --git a/apps/meteor/client/components/ScrollableContentWrapper.tsx b/apps/meteor/client/components/ScrollableContentWrapper.tsx
index 3671d317221..28e935a0eff 100644
--- a/apps/meteor/client/components/ScrollableContentWrapper.tsx
+++ b/apps/meteor/client/components/ScrollableContentWrapper.tsx
@@ -1,5 +1,7 @@
-import { Scrollbars, ScrollValues } from 'rc-scrollbars';
-import React, { MutableRefObject, CSSProperties, useMemo, memo, forwardRef, ReactNode, ReactElement } from 'react';
+import type { ScrollValues } from 'rc-scrollbars';
+import { Scrollbars } from 'rc-scrollbars';
+import type { MutableRefObject, CSSProperties, ReactNode, ReactElement } from 'react';
+import React, { useMemo, memo, forwardRef } from 'react';
 
 const styleDefault = {
 	width: '100%',
diff --git a/apps/meteor/client/components/Sidebar/Content.tsx b/apps/meteor/client/components/Sidebar/Content.tsx
index 866594071c5..1057e00fe9f 100644
--- a/apps/meteor/client/components/Sidebar/Content.tsx
+++ b/apps/meteor/client/components/Sidebar/Content.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import ScrollableContentWrapper from '../ScrollableContentWrapper';
 
diff --git a/apps/meteor/client/components/Sidebar/Header.tsx b/apps/meteor/client/components/Sidebar/Header.tsx
index 829cde7ce60..34f2dcbdb9e 100644
--- a/apps/meteor/client/components/Sidebar/Header.tsx
+++ b/apps/meteor/client/components/Sidebar/Header.tsx
@@ -1,5 +1,6 @@
 import { Box, IconButton } from '@rocket.chat/fuselage';
-import React, { FC, ReactNode } from 'react';
+import type { FC, ReactNode } from 'react';
+import React from 'react';
 
 type HeaderProps = {
 	title?: ReactNode;
diff --git a/apps/meteor/client/components/Sidebar/ListItem.tsx b/apps/meteor/client/components/Sidebar/ListItem.tsx
index e4a899c83c9..44ca4098353 100644
--- a/apps/meteor/client/components/Sidebar/ListItem.tsx
+++ b/apps/meteor/client/components/Sidebar/ListItem.tsx
@@ -1,5 +1,6 @@
 import { Option, OptionColumn, OptionContent, OptionIcon } from '@rocket.chat/fuselage';
-import React, { ComponentProps, MouseEventHandler, ReactElement, ReactNode } from 'react';
+import type { ComponentProps, MouseEventHandler, ReactElement, ReactNode } from 'react';
+import React from 'react';
 
 type ListItemProps = {
 	text: ReactNode;
diff --git a/apps/meteor/client/components/Sidebar/Sidebar.tsx b/apps/meteor/client/components/Sidebar/Sidebar.tsx
index 2e8b572365d..9d8fa27f8ea 100644
--- a/apps/meteor/client/components/Sidebar/Sidebar.tsx
+++ b/apps/meteor/client/components/Sidebar/Sidebar.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 const Sidebar: FC = ({ children, ...props }) => (
 	<Box display='flex' flexDirection='column' h='full' justifyContent='stretch' {...props}>
diff --git a/apps/meteor/client/components/Sidebar/SidebarGenericItem.tsx b/apps/meteor/client/components/Sidebar/SidebarGenericItem.tsx
index 28977f091d3..feeb1176632 100644
--- a/apps/meteor/client/components/Sidebar/SidebarGenericItem.tsx
+++ b/apps/meteor/client/components/Sidebar/SidebarGenericItem.tsx
@@ -1,7 +1,8 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box } from '@rocket.chat/fuselage';
 import type colors from '@rocket.chat/fuselage-tokens/colors';
-import React, { memo, ReactElement, ReactNode } from 'react';
+import type { ReactElement, ReactNode } from 'react';
+import React, { memo } from 'react';
 
 type SidebarGenericItemProps = {
 	href?: string;
diff --git a/apps/meteor/client/components/Sidebar/SidebarItemsAssembler.tsx b/apps/meteor/client/components/Sidebar/SidebarItemsAssembler.tsx
index 52eb00bc76a..123f5599762 100644
--- a/apps/meteor/client/components/Sidebar/SidebarItemsAssembler.tsx
+++ b/apps/meteor/client/components/Sidebar/SidebarItemsAssembler.tsx
@@ -1,7 +1,8 @@
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { memo, FC } from 'react';
+import type { FC } from 'react';
+import React, { memo } from 'react';
 
-import { SidebarItem } from '../../lib/createSidebarItems';
+import type { SidebarItem } from '../../lib/createSidebarItems';
 import SidebarNavigationItem from './SidebarNavigationItem';
 
 type SidebarItemsAssemblerProps = {
diff --git a/apps/meteor/client/components/Sidebar/SidebarNavigationItem.tsx b/apps/meteor/client/components/Sidebar/SidebarNavigationItem.tsx
index 4360a7a05ba..24c386bb32b 100644
--- a/apps/meteor/client/components/Sidebar/SidebarNavigationItem.tsx
+++ b/apps/meteor/client/components/Sidebar/SidebarNavigationItem.tsx
@@ -1,6 +1,8 @@
-import { Box, Icon, IconProps, Tag } from '@rocket.chat/fuselage';
+import type { IconProps } from '@rocket.chat/fuselage';
+import { Box, Icon, Tag } from '@rocket.chat/fuselage';
 import { useRoutePath } from '@rocket.chat/ui-contexts';
-import React, { memo, useMemo, FC } from 'react';
+import type { FC } from 'react';
+import React, { memo, useMemo } from 'react';
 
 import SidebarGenericItem from './SidebarGenericItem';
 
diff --git a/apps/meteor/client/components/Skeleton.tsx b/apps/meteor/client/components/Skeleton.tsx
index ef15454052e..da7ed88272e 100644
--- a/apps/meteor/client/components/Skeleton.tsx
+++ b/apps/meteor/client/components/Skeleton.tsx
@@ -1,5 +1,6 @@
 import { Box, Skeleton } from '@rocket.chat/fuselage';
-import React, { ComponentProps, ReactElement } from 'react';
+import type { ComponentProps, ReactElement } from 'react';
+import React from 'react';
 
 export const FormSkeleton = (props: ComponentProps<typeof Box>): ReactElement => (
 	<Box w='full' pb='x24' {...props}>
diff --git a/apps/meteor/client/components/SortList/GroupingList.tsx b/apps/meteor/client/components/SortList/GroupingList.tsx
index 7a4408cd12c..0e33252c23e 100644
--- a/apps/meteor/client/components/SortList/GroupingList.tsx
+++ b/apps/meteor/client/components/SortList/GroupingList.tsx
@@ -1,6 +1,7 @@
 import { CheckBox, OptionTitle } from '@rocket.chat/fuselage';
 import { useUserPreference, useTranslation, useEndpoint } from '@rocket.chat/ui-contexts';
-import React, { useCallback, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useCallback } from 'react';
 
 import ListItem from '../Sidebar/ListItem';
 
diff --git a/apps/meteor/client/components/SortList/SortList.tsx b/apps/meteor/client/components/SortList/SortList.tsx
index 721bca5329c..64fcd975195 100644
--- a/apps/meteor/client/components/SortList/SortList.tsx
+++ b/apps/meteor/client/components/SortList/SortList.tsx
@@ -1,5 +1,6 @@
 import { OptionDivider } from '@rocket.chat/fuselage';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import GroupingList from './GroupingList';
 import SortModeList from './SortModeList';
diff --git a/apps/meteor/client/components/SortList/SortModeList.tsx b/apps/meteor/client/components/SortList/SortModeList.tsx
index 8d61ff66fe2..cc79e8f7c7f 100644
--- a/apps/meteor/client/components/SortList/SortModeList.tsx
+++ b/apps/meteor/client/components/SortList/SortModeList.tsx
@@ -1,6 +1,7 @@
 import { RadioButton, OptionTitle } from '@rocket.chat/fuselage';
 import { useUserPreference, useTranslation, useEndpoint } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useCallback } from 'react';
+import type { ReactElement } from 'react';
+import React, { useCallback } from 'react';
 
 import ListItem from '../Sidebar/ListItem';
 
diff --git a/apps/meteor/client/components/SortList/ViewModeList.tsx b/apps/meteor/client/components/SortList/ViewModeList.tsx
index 6a62d8d793c..3fcea805869 100644
--- a/apps/meteor/client/components/SortList/ViewModeList.tsx
+++ b/apps/meteor/client/components/SortList/ViewModeList.tsx
@@ -1,6 +1,7 @@
 import { ToggleSwitch, RadioButton, OptionTitle } from '@rocket.chat/fuselage';
 import { useUserPreference, useTranslation, useEndpoint } from '@rocket.chat/ui-contexts';
-import React, { useCallback, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useCallback } from 'react';
 
 import ListItem from '../Sidebar/ListItem';
 
diff --git a/apps/meteor/client/components/Subtitle.tsx b/apps/meteor/client/components/Subtitle.tsx
index 4cb89d2f84f..eb67fd5ecfe 100644
--- a/apps/meteor/client/components/Subtitle.tsx
+++ b/apps/meteor/client/components/Subtitle.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 // @deprecated
 function Subtitle(props: { children: ReactElement }): ReactElement {
diff --git a/apps/meteor/client/components/TextCopy.tsx b/apps/meteor/client/components/TextCopy.tsx
index dc92e722a0a..658cec401eb 100644
--- a/apps/meteor/client/components/TextCopy.tsx
+++ b/apps/meteor/client/components/TextCopy.tsx
@@ -1,6 +1,7 @@
 import { Box, Icon, Button, Scrollable } from '@rocket.chat/fuselage';
 import { useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useCallback, ComponentProps, ReactElement } from 'react';
+import type { ComponentProps, ReactElement } from 'react';
+import React, { useCallback } from 'react';
 
 const defaultWrapperRenderer = (text: string): ReactElement => (
 	<Box fontFamily='mono' alignSelf='center' fontScale='p2' style={{ wordBreak: 'break-all' }} mie='x4' flexGrow={1} maxHeight='x108'>
diff --git a/apps/meteor/client/components/TooltipPortal.tsx b/apps/meteor/client/components/TooltipPortal.tsx
index 6137ba860c0..f841e59899f 100644
--- a/apps/meteor/client/components/TooltipPortal.tsx
+++ b/apps/meteor/client/components/TooltipPortal.tsx
@@ -1,4 +1,5 @@
-import { FC, memo, useEffect, useState } from 'react';
+import type { FC } from 'react';
+import { memo, useEffect, useState } from 'react';
 import { createPortal } from 'react-dom';
 
 import { createAnchor } from '../lib/utils/createAnchor';
diff --git a/apps/meteor/client/components/TwoFactorModal/TwoFactorEmailModal.tsx b/apps/meteor/client/components/TwoFactorModal/TwoFactorEmailModal.tsx
index 0e4569694fe..88f8bfdef78 100644
--- a/apps/meteor/client/components/TwoFactorModal/TwoFactorEmailModal.tsx
+++ b/apps/meteor/client/components/TwoFactorModal/TwoFactorEmailModal.tsx
@@ -1,10 +1,12 @@
 import { Box, TextInput, Icon } from '@rocket.chat/fuselage';
 import { useAutoFocus } from '@rocket.chat/fuselage-hooks';
 import { useToastMessageDispatch, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useState, ChangeEvent } from 'react';
+import type { ReactElement, ChangeEvent } from 'react';
+import React, { useState } from 'react';
 
 import GenericModal from '../GenericModal';
-import { Method, OnConfirm } from './TwoFactorModal';
+import type { OnConfirm } from './TwoFactorModal';
+import { Method } from './TwoFactorModal';
 
 type TwoFactorEmailModalProps = {
 	onConfirm: OnConfirm;
diff --git a/apps/meteor/client/components/TwoFactorModal/TwoFactorModal.tsx b/apps/meteor/client/components/TwoFactorModal/TwoFactorModal.tsx
index f2a0750fa10..7275b94aa87 100644
--- a/apps/meteor/client/components/TwoFactorModal/TwoFactorModal.tsx
+++ b/apps/meteor/client/components/TwoFactorModal/TwoFactorModal.tsx
@@ -1,4 +1,5 @@
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import TwoFactorEmail from './TwoFactorEmailModal';
 import TwoFactorPassword from './TwoFactorPasswordModal';
diff --git a/apps/meteor/client/components/TwoFactorModal/TwoFactorPasswordModal.tsx b/apps/meteor/client/components/TwoFactorModal/TwoFactorPasswordModal.tsx
index c9c376b05db..ba53fa8ce53 100644
--- a/apps/meteor/client/components/TwoFactorModal/TwoFactorPasswordModal.tsx
+++ b/apps/meteor/client/components/TwoFactorModal/TwoFactorPasswordModal.tsx
@@ -1,10 +1,12 @@
 import { Box, PasswordInput, Icon } from '@rocket.chat/fuselage';
 import { useAutoFocus } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useState, ChangeEvent, Ref } from 'react';
+import type { ReactElement, ChangeEvent, Ref } from 'react';
+import React, { useState } from 'react';
 
 import GenericModal from '../GenericModal';
-import { Method, OnConfirm } from './TwoFactorModal';
+import type { OnConfirm } from './TwoFactorModal';
+import { Method } from './TwoFactorModal';
 
 type TwoFactorPasswordModalProps = {
 	onConfirm: OnConfirm;
diff --git a/apps/meteor/client/components/TwoFactorModal/TwoFactorTotpModal.tsx b/apps/meteor/client/components/TwoFactorModal/TwoFactorTotpModal.tsx
index 8d514ec6dbc..010d162a13e 100644
--- a/apps/meteor/client/components/TwoFactorModal/TwoFactorTotpModal.tsx
+++ b/apps/meteor/client/components/TwoFactorModal/TwoFactorTotpModal.tsx
@@ -1,10 +1,12 @@
 import { Box, TextInput, Icon } from '@rocket.chat/fuselage';
 import { useAutoFocus } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useState, ChangeEvent } from 'react';
+import type { ReactElement, ChangeEvent } from 'react';
+import React, { useState } from 'react';
 
 import GenericModal from '../GenericModal';
-import { Method, OnConfirm } from './TwoFactorModal';
+import type { OnConfirm } from './TwoFactorModal';
+import { Method } from './TwoFactorModal';
 
 type TwoFactorTotpModalProps = {
 	onConfirm: OnConfirm;
diff --git a/apps/meteor/client/components/UTCClock.tsx b/apps/meteor/client/components/UTCClock.tsx
index 90f8ca168ee..eb0368b72ab 100644
--- a/apps/meteor/client/components/UTCClock.tsx
+++ b/apps/meteor/client/components/UTCClock.tsx
@@ -1,4 +1,5 @@
-import React, { memo, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { memo } from 'react';
 
 import { useUTCClock } from '../hooks/useUTCClock';
 
diff --git a/apps/meteor/client/components/UrlChangeModal.tsx b/apps/meteor/client/components/UrlChangeModal.tsx
index 19475920253..1418d04c5b3 100644
--- a/apps/meteor/client/components/UrlChangeModal.tsx
+++ b/apps/meteor/client/components/UrlChangeModal.tsx
@@ -1,6 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import GenericModal from './GenericModal';
 
diff --git a/apps/meteor/client/components/UserAutoComplete/UserAutoComplete.stories.tsx b/apps/meteor/client/components/UserAutoComplete/UserAutoComplete.stories.tsx
index 97049b14e9e..757c10b35b8 100644
--- a/apps/meteor/client/components/UserAutoComplete/UserAutoComplete.stories.tsx
+++ b/apps/meteor/client/components/UserAutoComplete/UserAutoComplete.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import UserAutoComplete from '.';
diff --git a/apps/meteor/client/components/UserAutoComplete/UserAutoComplete.tsx b/apps/meteor/client/components/UserAutoComplete/UserAutoComplete.tsx
index ce33acd830b..55b8f74678e 100644
--- a/apps/meteor/client/components/UserAutoComplete/UserAutoComplete.tsx
+++ b/apps/meteor/client/components/UserAutoComplete/UserAutoComplete.tsx
@@ -1,6 +1,7 @@
 import { AutoComplete, Option, Box, Chip, Options } from '@rocket.chat/fuselage';
 import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
-import React, { ComponentProps, memo, ReactElement, useMemo, useState } from 'react';
+import type { ComponentProps, ReactElement } from 'react';
+import React, { memo, useMemo, useState } from 'react';
 
 import { useEndpointData } from '../../hooks/useEndpointData';
 import UserAvatar from '../avatar/UserAvatar';
diff --git a/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultiple.tsx b/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultiple.tsx
index 2a74f05ef1f..6f5a95fd3e5 100644
--- a/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultiple.tsx
+++ b/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultiple.tsx
@@ -1,6 +1,7 @@
 import { AutoComplete, Box, Option, OptionAvatar, OptionContent, Chip, OptionDescription } from '@rocket.chat/fuselage';
 import { useMutableCallback, useDebouncedValue } from '@rocket.chat/fuselage-hooks';
-import React, { ComponentProps, memo, ReactElement, useMemo, useState } from 'react';
+import type { ComponentProps, ReactElement } from 'react';
+import React, { memo, useMemo, useState } from 'react';
 
 import { useEndpointData } from '../../hooks/useEndpointData';
 import UserAvatar from '../avatar/UserAvatar';
diff --git a/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultipleFederated.tsx b/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultipleFederated.tsx
index 24380550ded..65396e0eec7 100644
--- a/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultipleFederated.tsx
+++ b/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultipleFederated.tsx
@@ -2,7 +2,8 @@ import { MultiSelectFiltered, Icon, Box, Chip } from '@rocket.chat/fuselage';
 import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
 import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
-import React, { memo, ReactElement, useState, useCallback, useMemo } from 'react';
+import type { ReactElement } from 'react';
+import React, { memo, useState, useCallback, useMemo } from 'react';
 
 import UserAvatar from '../avatar/UserAvatar';
 import AutocompleteOptions, { OptionsContext } from './UserAutoCompleteMultipleOptions';
diff --git a/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultipleOption.tsx b/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultipleOption.tsx
index 799e5d79454..afe5ed209a8 100644
--- a/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultipleOption.tsx
+++ b/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultipleOption.tsx
@@ -1,6 +1,7 @@
-import { IUser } from '@rocket.chat/core-typings';
+import type { IUser } from '@rocket.chat/core-typings';
 import { Option, OptionDescription } from '@rocket.chat/fuselage';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import UserAvatar from '../avatar/UserAvatar';
 
diff --git a/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultipleOptions.tsx b/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultipleOptions.tsx
index 69a25a5381e..e6eca435e13 100644
--- a/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultipleOptions.tsx
+++ b/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultipleOptions.tsx
@@ -1,11 +1,9 @@
 import { Options } from '@rocket.chat/fuselage';
-import React, { forwardRef, ComponentProps, ReactElement, Ref, createContext, useContext } from 'react';
+import type { ComponentProps, ReactElement, Ref } from 'react';
+import React, { forwardRef, createContext, useContext } from 'react';
 
-import { UserAutoCompleteOptionType } from './UserAutoCompleteMultipleFederated';
 import UserAutoCompleteMultipleOption from './UserAutoCompleteMultipleOption';
 
-type Options = Array<[UserAutoCompleteOptionType['username'], UserAutoCompleteOptionType]>;
-
 // This is a hack in order to bypass the MultiSelect filter.
 // The select requires a forwarded ref component in the renderOptions property
 // but we also need to pass internal state to this renderer, as well as the props that also come from the Select.
diff --git a/apps/meteor/client/components/UserCard/UserCard.stories.tsx b/apps/meteor/client/components/UserCard/UserCard.stories.tsx
index 65c3394efa9..b07d4a09cc7 100644
--- a/apps/meteor/client/components/UserCard/UserCard.stories.tsx
+++ b/apps/meteor/client/components/UserCard/UserCard.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import UserCard from '.';
diff --git a/apps/meteor/client/components/UserCard/UserCard.tsx b/apps/meteor/client/components/UserCard/UserCard.tsx
index 13f38c04150..e54ab6ae573 100644
--- a/apps/meteor/client/components/UserCard/UserCard.tsx
+++ b/apps/meteor/client/components/UserCard/UserCard.tsx
@@ -1,7 +1,8 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box, IconButton, Skeleton } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { forwardRef, ReactNode, ComponentProps, MouseEvent } from 'react';
+import type { ReactNode, ComponentProps, MouseEvent } from 'react';
+import React, { forwardRef } from 'react';
 
 import MarkdownText from '../MarkdownText';
 import * as Status from '../UserStatus';
diff --git a/apps/meteor/client/components/UserCard/UserCardAction.tsx b/apps/meteor/client/components/UserCard/UserCardAction.tsx
index d006382e457..e17716886da 100644
--- a/apps/meteor/client/components/UserCard/UserCardAction.tsx
+++ b/apps/meteor/client/components/UserCard/UserCardAction.tsx
@@ -1,5 +1,6 @@
 import { IconButton } from '@rocket.chat/fuselage';
-import React, { ReactElement, ComponentProps } from 'react';
+import type { ReactElement, ComponentProps } from 'react';
+import React from 'react';
 
 type UserCardActionProps = ComponentProps<typeof IconButton>;
 
diff --git a/apps/meteor/client/components/UserCard/UserCardContainer.tsx b/apps/meteor/client/components/UserCard/UserCardContainer.tsx
index 73f8aa1fc2a..4d897e182ef 100644
--- a/apps/meteor/client/components/UserCard/UserCardContainer.tsx
+++ b/apps/meteor/client/components/UserCard/UserCardContainer.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { forwardRef, ComponentProps } from 'react';
+import type { ComponentProps } from 'react';
+import React, { forwardRef } from 'react';
 
 const UserCardContainer = forwardRef(function UserCardContainer(props: ComponentProps<typeof Box>, ref) {
 	return <Box ref={ref} rcx-user-card bg='surface' elevation='2' p='x24' display='flex' borderRadius='x4' width='439px' {...props} />;
diff --git a/apps/meteor/client/components/UserCard/UserCardInfo.tsx b/apps/meteor/client/components/UserCard/UserCardInfo.tsx
index fab834ef8af..1db62882c74 100644
--- a/apps/meteor/client/components/UserCard/UserCardInfo.tsx
+++ b/apps/meteor/client/components/UserCard/UserCardInfo.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { ReactElement, ComponentProps } from 'react';
+import type { ReactElement, ComponentProps } from 'react';
+import React from 'react';
 
 const UserCardInfo = (props: ComponentProps<typeof Box>): ReactElement => (
 	<Box mbe='x8' is='span' fontScale='p2' color='hint' withTruncatedText {...props} />
diff --git a/apps/meteor/client/components/UserCard/UserCardRole.tsx b/apps/meteor/client/components/UserCard/UserCardRole.tsx
index 71931300912..2934aef8eda 100644
--- a/apps/meteor/client/components/UserCard/UserCardRole.tsx
+++ b/apps/meteor/client/components/UserCard/UserCardRole.tsx
@@ -1,5 +1,6 @@
 import { Box, Tag } from '@rocket.chat/fuselage';
-import React, { ReactNode, ReactElement } from 'react';
+import type { ReactNode, ReactElement } from 'react';
+import React from 'react';
 
 const UserCardRole = ({ children }: { children: ReactNode }): ReactElement => (
 	<Box m='x2' fontScale='c2'>
diff --git a/apps/meteor/client/components/UserCard/UserCardRoles.tsx b/apps/meteor/client/components/UserCard/UserCardRoles.tsx
index 398bbe7cc2c..9cd22ebdff3 100644
--- a/apps/meteor/client/components/UserCard/UserCardRoles.tsx
+++ b/apps/meteor/client/components/UserCard/UserCardRoles.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { ReactNode, ReactElement } from 'react';
+import type { ReactNode, ReactElement } from 'react';
+import React from 'react';
 
 import UserCardInfo from './UserCardInfo';
 
diff --git a/apps/meteor/client/components/UserCard/UserCardUsername.tsx b/apps/meteor/client/components/UserCard/UserCardUsername.tsx
index 494f2f3e1e2..b72344a10e3 100644
--- a/apps/meteor/client/components/UserCard/UserCardUsername.tsx
+++ b/apps/meteor/client/components/UserCard/UserCardUsername.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { ReactElement, ReactNode, ComponentProps } from 'react';
+import type { ReactElement, ReactNode, ComponentProps } from 'react';
+import React from 'react';
 
 import * as UserStatus from '../UserStatus';
 
diff --git a/apps/meteor/client/components/UserInfo/UserInfo.stories.tsx b/apps/meteor/client/components/UserInfo/UserInfo.stories.tsx
index afdf28c1299..6e07b44f3fa 100644
--- a/apps/meteor/client/components/UserInfo/UserInfo.stories.tsx
+++ b/apps/meteor/client/components/UserInfo/UserInfo.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import * as Status from '../UserStatus';
diff --git a/apps/meteor/client/components/UserInfo/UserInfo.tsx b/apps/meteor/client/components/UserInfo/UserInfo.tsx
index 329ca656e8d..7f721a401ec 100644
--- a/apps/meteor/client/components/UserInfo/UserInfo.tsx
+++ b/apps/meteor/client/components/UserInfo/UserInfo.tsx
@@ -1,7 +1,9 @@
-import { IUser, Serialized } from '@rocket.chat/core-typings';
+import type { IUser, Serialized } from '@rocket.chat/core-typings';
 import { Box, Margins, Tag } from '@rocket.chat/fuselage';
-import { TranslationKey, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { memo, ReactElement, ReactNode } from 'react';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
+import type { ReactElement, ReactNode } from 'react';
+import React, { memo } from 'react';
 
 import { useTimeAgo } from '../../hooks/useTimeAgo';
 import { useUserCustomFields } from '../../hooks/useUserCustomFields';
diff --git a/apps/meteor/client/components/UserInfo/UserInfoAction.tsx b/apps/meteor/client/components/UserInfo/UserInfoAction.tsx
index 9cd161b0d89..958606e3570 100644
--- a/apps/meteor/client/components/UserInfo/UserInfoAction.tsx
+++ b/apps/meteor/client/components/UserInfo/UserInfoAction.tsx
@@ -1,5 +1,6 @@
 import { Button, Icon } from '@rocket.chat/fuselage';
-import React, { ReactElement, ComponentProps } from 'react';
+import type { ReactElement, ComponentProps } from 'react';
+import React from 'react';
 
 type UserInfoActionProps = {
 	icon: ComponentProps<typeof Icon>['name'];
diff --git a/apps/meteor/client/components/UserInfo/UserInfoAvatar.tsx b/apps/meteor/client/components/UserInfo/UserInfoAvatar.tsx
index 4a0340f3381..2fbe4a05ed5 100644
--- a/apps/meteor/client/components/UserInfo/UserInfoAvatar.tsx
+++ b/apps/meteor/client/components/UserInfo/UserInfoAvatar.tsx
@@ -1,4 +1,5 @@
-import React, { ComponentProps, ReactElement } from 'react';
+import type { ComponentProps, ReactElement } from 'react';
+import React from 'react';
 
 import UserAvatar from '../avatar/UserAvatar';
 
diff --git a/apps/meteor/client/components/UserInfo/UserInfoUsername.tsx b/apps/meteor/client/components/UserInfo/UserInfoUsername.tsx
index 61a64e780a1..75d2c87a82c 100644
--- a/apps/meteor/client/components/UserInfo/UserInfoUsername.tsx
+++ b/apps/meteor/client/components/UserInfo/UserInfoUsername.tsx
@@ -1,16 +1,17 @@
-import { IUser } from '@rocket.chat/core-typings';
-import { Box } from '@rocket.chat/fuselage';
-import React, { ReactElement, ComponentProps } from 'react';
+import type { IUser } from '@rocket.chat/core-typings';
+import type { Box } from '@rocket.chat/fuselage';
+import type { ReactElement, ComponentProps } from 'react';
+import React from 'react';
 
 import UserCard from '../UserCard';
 
-type UserInfoUsername = {
+type UserInfoUsernameProps = {
 	username: IUser['username'];
 	status: ReactElement;
 } & ComponentProps<typeof Box>;
 
 // TODO: Remove UserCard.Username
-const UserInfoUsername = ({ username, status, ...props }: UserInfoUsername): ReactElement => (
+const UserInfoUsername = ({ username, status, ...props }: UserInfoUsernameProps): ReactElement => (
 	<UserCard.Username name={username} status={status} {...props} />
 );
 
diff --git a/apps/meteor/client/components/UserStatus/ReactiveUserStatus.tsx b/apps/meteor/client/components/UserStatus/ReactiveUserStatus.tsx
index 4cac6f7409f..d8d151c10b6 100644
--- a/apps/meteor/client/components/UserStatus/ReactiveUserStatus.tsx
+++ b/apps/meteor/client/components/UserStatus/ReactiveUserStatus.tsx
@@ -1,6 +1,7 @@
 import type { IUser } from '@rocket.chat/core-typings';
 import { UserStatus } from '@rocket.chat/ui-client';
-import React, { ComponentProps, memo, ReactElement } from 'react';
+import type { ComponentProps, ReactElement } from 'react';
+import React, { memo } from 'react';
 
 import { usePresence } from '../../hooks/usePresence';
 
diff --git a/apps/meteor/client/components/UserStatusMenu.tsx b/apps/meteor/client/components/UserStatusMenu.tsx
index f7bdd4bcd64..69ab0c089ac 100644
--- a/apps/meteor/client/components/UserStatusMenu.tsx
+++ b/apps/meteor/client/components/UserStatusMenu.tsx
@@ -2,7 +2,8 @@ import { UserStatus as UserStatusType } from '@rocket.chat/core-typings';
 import { Button, PositionAnimated, Options, useCursor, Box } from '@rocket.chat/fuselage';
 import type { Placements } from '@rocket.chat/fuselage-hooks';
 import { useSetting, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, ComponentProps, useRef, useCallback, useState, useMemo, useEffect } from 'react';
+import type { ReactElement, ComponentProps } from 'react';
+import React, { useRef, useCallback, useState, useMemo, useEffect } from 'react';
 
 import { UserStatus } from './UserStatus';
 
diff --git a/apps/meteor/client/components/VerticalBar/VerticalBar.tsx b/apps/meteor/client/components/VerticalBar/VerticalBar.tsx
index a0c3a1c9a64..168ef9d56da 100644
--- a/apps/meteor/client/components/VerticalBar/VerticalBar.tsx
+++ b/apps/meteor/client/components/VerticalBar/VerticalBar.tsx
@@ -1,6 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
 import { useLayoutSizes, useLayoutContextualBarPosition } from '@rocket.chat/ui-contexts';
-import React, { FC, ComponentProps, memo } from 'react';
+import type { FC, ComponentProps } from 'react';
+import React, { memo } from 'react';
 
 const VerticalBar: FC<ComponentProps<typeof Box>> = ({ children, ...props }) => {
 	const sizes = useLayoutSizes();
diff --git a/apps/meteor/client/components/VerticalBar/VerticalBarAction.tsx b/apps/meteor/client/components/VerticalBar/VerticalBarAction.tsx
index 564b66b0660..5a186cd8e83 100644
--- a/apps/meteor/client/components/VerticalBar/VerticalBarAction.tsx
+++ b/apps/meteor/client/components/VerticalBar/VerticalBarAction.tsx
@@ -1,5 +1,7 @@
-import { IconButton, Icon } from '@rocket.chat/fuselage';
-import React, { ReactElement, memo, MouseEventHandler, ComponentProps } from 'react';
+import type { Icon } from '@rocket.chat/fuselage';
+import { IconButton } from '@rocket.chat/fuselage';
+import type { ReactElement, MouseEventHandler, ComponentProps } from 'react';
+import React, { memo } from 'react';
 
 const VerticalBarAction = ({
 	name,
diff --git a/apps/meteor/client/components/VerticalBar/VerticalBarActions.tsx b/apps/meteor/client/components/VerticalBar/VerticalBarActions.tsx
index bed17622a9b..2373bf88376 100644
--- a/apps/meteor/client/components/VerticalBar/VerticalBarActions.tsx
+++ b/apps/meteor/client/components/VerticalBar/VerticalBarActions.tsx
@@ -1,5 +1,6 @@
 import { ButtonGroup } from '@rocket.chat/fuselage';
-import React, { memo, ReactElement, ComponentProps } from 'react';
+import type { ReactElement, ComponentProps } from 'react';
+import React, { memo } from 'react';
 
 const VerticalBarActions = (props: ComponentProps<typeof ButtonGroup>): ReactElement => <ButtonGroup medium {...props} />;
 
diff --git a/apps/meteor/client/components/VerticalBar/VerticalBarBack.tsx b/apps/meteor/client/components/VerticalBar/VerticalBarBack.tsx
index ecfcc9716be..14be4e246cf 100644
--- a/apps/meteor/client/components/VerticalBar/VerticalBarBack.tsx
+++ b/apps/meteor/client/components/VerticalBar/VerticalBarBack.tsx
@@ -1,5 +1,6 @@
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, memo, ComponentProps } from 'react';
+import type { ReactElement, ComponentProps } from 'react';
+import React, { memo } from 'react';
 
 import VerticalBarAction from './VerticalBarAction';
 
diff --git a/apps/meteor/client/components/VerticalBar/VerticalBarButton.tsx b/apps/meteor/client/components/VerticalBar/VerticalBarButton.tsx
index 299cfa0c77e..ced9e4b6bee 100644
--- a/apps/meteor/client/components/VerticalBar/VerticalBarButton.tsx
+++ b/apps/meteor/client/components/VerticalBar/VerticalBarButton.tsx
@@ -1,5 +1,6 @@
 import { Button } from '@rocket.chat/fuselage';
-import React, { ComponentProps, memo, ReactElement } from 'react';
+import type { ComponentProps, ReactElement } from 'react';
+import React, { memo } from 'react';
 
 const VerticalBarButton = (props: ComponentProps<typeof Button>): ReactElement => (
 	<Button small square flexShrink={0} secondary {...props} />
diff --git a/apps/meteor/client/components/VerticalBar/VerticalBarClose.tsx b/apps/meteor/client/components/VerticalBar/VerticalBarClose.tsx
index 13b9215b2a4..6ceee2819f5 100644
--- a/apps/meteor/client/components/VerticalBar/VerticalBarClose.tsx
+++ b/apps/meteor/client/components/VerticalBar/VerticalBarClose.tsx
@@ -1,5 +1,6 @@
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { memo, ComponentProps, ReactElement } from 'react';
+import type { ComponentProps, ReactElement } from 'react';
+import React, { memo } from 'react';
 
 import VerticalBarAction from './VerticalBarAction';
 
diff --git a/apps/meteor/client/components/VerticalBar/VerticalBarContent.tsx b/apps/meteor/client/components/VerticalBar/VerticalBarContent.tsx
index c5ede1f71b3..c7b58db65a5 100644
--- a/apps/meteor/client/components/VerticalBar/VerticalBarContent.tsx
+++ b/apps/meteor/client/components/VerticalBar/VerticalBarContent.tsx
@@ -1,4 +1,5 @@
-import React, { ComponentProps, forwardRef, memo } from 'react';
+import type { ComponentProps } from 'react';
+import React, { forwardRef, memo } from 'react';
 
 import Page from '../Page';
 
diff --git a/apps/meteor/client/components/VerticalBar/VerticalBarFooter.tsx b/apps/meteor/client/components/VerticalBar/VerticalBarFooter.tsx
index b73e94bb228..68f8d07d5c5 100644
--- a/apps/meteor/client/components/VerticalBar/VerticalBarFooter.tsx
+++ b/apps/meteor/client/components/VerticalBar/VerticalBarFooter.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { forwardRef, ComponentProps, memo } from 'react';
+import type { ComponentProps } from 'react';
+import React, { forwardRef, memo } from 'react';
 
 const VerticalBarFooter = forwardRef<HTMLElement, ComponentProps<typeof Box>>(function VerticalBarFooter({ children, ...props }, ref) {
 	return (
diff --git a/apps/meteor/client/components/VerticalBar/VerticalBarHeader.tsx b/apps/meteor/client/components/VerticalBar/VerticalBarHeader.tsx
index 28998c1776e..1760361eb29 100644
--- a/apps/meteor/client/components/VerticalBar/VerticalBarHeader.tsx
+++ b/apps/meteor/client/components/VerticalBar/VerticalBarHeader.tsx
@@ -1,5 +1,6 @@
 import { Box, Margins } from '@rocket.chat/fuselage';
-import React, { FC, memo, ReactNode, ComponentProps } from 'react';
+import type { FC, ReactNode, ComponentProps } from 'react';
+import React, { memo } from 'react';
 
 const VerticalBarHeader: FC<{ children: ReactNode; props?: ComponentProps<typeof Box> }> = ({ children, ...props }) => (
 	<Box
diff --git a/apps/meteor/client/components/VerticalBar/VerticalBarIcon.tsx b/apps/meteor/client/components/VerticalBar/VerticalBarIcon.tsx
index 10f3b76b3e7..bc76a112efa 100644
--- a/apps/meteor/client/components/VerticalBar/VerticalBarIcon.tsx
+++ b/apps/meteor/client/components/VerticalBar/VerticalBarIcon.tsx
@@ -1,5 +1,6 @@
 import { Icon } from '@rocket.chat/fuselage';
-import React, { ReactElement, ComponentProps, memo } from 'react';
+import type { ReactElement, ComponentProps } from 'react';
+import React, { memo } from 'react';
 
 const VerticalBarIcon = (props: ComponentProps<typeof Icon>): ReactElement => <Icon {...props} pi='x2' size='x24' />;
 
diff --git a/apps/meteor/client/components/VerticalBar/VerticalBarInnerContent.tsx b/apps/meteor/client/components/VerticalBar/VerticalBarInnerContent.tsx
index 274776c8ddb..d3293681755 100644
--- a/apps/meteor/client/components/VerticalBar/VerticalBarInnerContent.tsx
+++ b/apps/meteor/client/components/VerticalBar/VerticalBarInnerContent.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { ReactElement, memo, ComponentProps } from 'react';
+import type { ReactElement, ComponentProps } from 'react';
+import React, { memo } from 'react';
 
 const VerticalBarInnerContent = (props: ComponentProps<typeof Box>): ReactElement => (
 	<Box rcx-vertical-bar--inner-content position='absolute' height='full' display='flex' insetInline={0} {...props} />
diff --git a/apps/meteor/client/components/VerticalBar/VerticalBarScrollableContent.tsx b/apps/meteor/client/components/VerticalBar/VerticalBarScrollableContent.tsx
index 839b99611aa..aeca831452a 100644
--- a/apps/meteor/client/components/VerticalBar/VerticalBarScrollableContent.tsx
+++ b/apps/meteor/client/components/VerticalBar/VerticalBarScrollableContent.tsx
@@ -1,5 +1,6 @@
 import { Margins } from '@rocket.chat/fuselage';
-import React, { forwardRef, memo, ComponentProps } from 'react';
+import type { ComponentProps } from 'react';
+import React, { forwardRef, memo } from 'react';
 
 import Page from '../Page';
 
diff --git a/apps/meteor/client/components/VerticalBar/VerticalBarSkeleton.tsx b/apps/meteor/client/components/VerticalBar/VerticalBarSkeleton.tsx
index 184c7836288..0a2cb2ca1a6 100644
--- a/apps/meteor/client/components/VerticalBar/VerticalBarSkeleton.tsx
+++ b/apps/meteor/client/components/VerticalBar/VerticalBarSkeleton.tsx
@@ -1,5 +1,6 @@
 import { Box, Skeleton } from '@rocket.chat/fuselage';
-import React, { ReactElement, ComponentProps, memo } from 'react';
+import type { ReactElement, ComponentProps } from 'react';
+import React, { memo } from 'react';
 
 import VerticalBar from './VerticalBar';
 import VerticalBarHeader from './VerticalBarHeader';
diff --git a/apps/meteor/client/components/VerticalBar/VerticalBarText.tsx b/apps/meteor/client/components/VerticalBar/VerticalBarText.tsx
index f7e8a81c7d5..872c0e6d50b 100644
--- a/apps/meteor/client/components/VerticalBar/VerticalBarText.tsx
+++ b/apps/meteor/client/components/VerticalBar/VerticalBarText.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { ReactElement, memo, ComponentProps } from 'react';
+import type { ReactElement, ComponentProps } from 'react';
+import React, { memo } from 'react';
 
 const VerticalBarText = (props: ComponentProps<typeof Box>): ReactElement => (
 	<Box flexShrink={1} flexGrow={1} withTruncatedText {...props} />
diff --git a/apps/meteor/client/components/WarningModal.tsx b/apps/meteor/client/components/WarningModal.tsx
index 11ba65d3ae3..1f3d3e2814e 100644
--- a/apps/meteor/client/components/WarningModal.tsx
+++ b/apps/meteor/client/components/WarningModal.tsx
@@ -1,6 +1,7 @@
 import { Button, Modal } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 type WarningModalProps = {
 	text: string;
diff --git a/apps/meteor/client/components/avatar/AppAvatar.tsx b/apps/meteor/client/components/avatar/AppAvatar.tsx
index fc19fca92e1..dc7b1025760 100644
--- a/apps/meteor/client/components/avatar/AppAvatar.tsx
+++ b/apps/meteor/client/components/avatar/AppAvatar.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import BaseAvatar from './BaseAvatar';
 
diff --git a/apps/meteor/client/components/avatar/BaseAvatar.tsx b/apps/meteor/client/components/avatar/BaseAvatar.tsx
index beec75d8c9f..f264f841bc8 100644
--- a/apps/meteor/client/components/avatar/BaseAvatar.tsx
+++ b/apps/meteor/client/components/avatar/BaseAvatar.tsx
@@ -1,5 +1,7 @@
-import { Avatar, AvatarProps, Skeleton } from '@rocket.chat/fuselage';
-import React, { FC, useState } from 'react';
+import type { AvatarProps } from '@rocket.chat/fuselage';
+import { Avatar, Skeleton } from '@rocket.chat/fuselage';
+import type { FC } from 'react';
+import React, { useState } from 'react';
 
 export type BaseAvatarProps = Omit<AvatarProps, 'is'>;
 
diff --git a/apps/meteor/client/components/avatar/RoomAvatar.tsx b/apps/meteor/client/components/avatar/RoomAvatar.tsx
index 750776a00b5..bf3c9650904 100644
--- a/apps/meteor/client/components/avatar/RoomAvatar.tsx
+++ b/apps/meteor/client/components/avatar/RoomAvatar.tsx
@@ -1,5 +1,6 @@
 import { useRoomAvatarPath } from '@rocket.chat/ui-contexts';
-import React, { memo, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { memo } from 'react';
 
 import BaseAvatar from './BaseAvatar';
 
diff --git a/apps/meteor/client/components/avatar/RoomAvatarEditor.tsx b/apps/meteor/client/components/avatar/RoomAvatarEditor.tsx
index f5ccaaa1699..de07d395297 100644
--- a/apps/meteor/client/components/avatar/RoomAvatarEditor.tsx
+++ b/apps/meteor/client/components/avatar/RoomAvatarEditor.tsx
@@ -1,9 +1,10 @@
-import { IRoom, RoomAdminFieldsType } from '@rocket.chat/core-typings';
+import type { IRoom, RoomAdminFieldsType } from '@rocket.chat/core-typings';
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Button, ButtonGroup, Icon } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useEffect, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useEffect } from 'react';
 
 import { getAvatarURL } from '../../../app/utils/lib/getAvatarURL';
 import { useFileInput } from '../../hooks/useFileInput';
diff --git a/apps/meteor/client/components/avatar/UserAvatar.tsx b/apps/meteor/client/components/avatar/UserAvatar.tsx
index 4aad156848d..ce0434dc0bb 100644
--- a/apps/meteor/client/components/avatar/UserAvatar.tsx
+++ b/apps/meteor/client/components/avatar/UserAvatar.tsx
@@ -1,7 +1,9 @@
 import { useUserAvatarPath } from '@rocket.chat/ui-contexts';
-import React, { FC, memo } from 'react';
+import type { FC } from 'react';
+import React, { memo } from 'react';
 
-import BaseAvatar, { BaseAvatarProps } from './BaseAvatar';
+import type { BaseAvatarProps } from './BaseAvatar';
+import BaseAvatar from './BaseAvatar';
 
 type UserAvatarProps = Omit<BaseAvatarProps, 'url' | 'title'> & {
 	username: string;
diff --git a/apps/meteor/client/components/avatar/UserAvatarEditor/UserAvatarEditor.tsx b/apps/meteor/client/components/avatar/UserAvatarEditor/UserAvatarEditor.tsx
index be5631ffd3a..bed6ba456e3 100644
--- a/apps/meteor/client/components/avatar/UserAvatarEditor/UserAvatarEditor.tsx
+++ b/apps/meteor/client/components/avatar/UserAvatarEditor/UserAvatarEditor.tsx
@@ -1,7 +1,8 @@
-import { IUser, AvatarObject } from '@rocket.chat/core-typings';
+import type { IUser, AvatarObject } from '@rocket.chat/core-typings';
 import { Box, Button, TextInput, Margins, Avatar, IconButton } from '@rocket.chat/fuselage';
 import { useToastMessageDispatch, useSetting, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useState, useCallback, ReactElement, ChangeEvent } from 'react';
+import type { ReactElement, ChangeEvent } from 'react';
+import React, { useState, useCallback } from 'react';
 
 import { useFileInput } from '../../../hooks/useFileInput';
 import { isValidImageFormat } from '../../../lib/utils/isValidImageFormat';
diff --git a/apps/meteor/client/components/connectionStatus/ConnectionStatusBar.stories.tsx b/apps/meteor/client/components/connectionStatus/ConnectionStatusBar.stories.tsx
index fe66879b8b6..76e502097db 100644
--- a/apps/meteor/client/components/connectionStatus/ConnectionStatusBar.stories.tsx
+++ b/apps/meteor/client/components/connectionStatus/ConnectionStatusBar.stories.tsx
@@ -1,8 +1,9 @@
 import { ConnectionStatusContext } from '@rocket.chat/ui-contexts';
 import { action } from '@storybook/addon-actions';
 import { Title, Description, Stories } from '@storybook/addon-docs';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
-import React, { ContextType, ReactElement } from 'react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ContextType, ReactElement } from 'react';
+import React from 'react';
 
 import ConnectionStatusBar from './ConnectionStatusBar';
 
diff --git a/apps/meteor/client/components/connectionStatus/ConnectionStatusBar.tsx b/apps/meteor/client/components/connectionStatus/ConnectionStatusBar.tsx
index 2dc854547ef..2737a6fc4d4 100644
--- a/apps/meteor/client/components/connectionStatus/ConnectionStatusBar.tsx
+++ b/apps/meteor/client/components/connectionStatus/ConnectionStatusBar.tsx
@@ -1,6 +1,7 @@
 import { Icon } from '@rocket.chat/fuselage';
 import { useConnectionStatus, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useEffect, useRef, useState, MouseEventHandler, FC } from 'react';
+import type { MouseEventHandler, FC } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 
 import './ConnectionStatusBar.styles.css';
 
diff --git a/apps/meteor/client/components/dataView/Counter.stories.tsx b/apps/meteor/client/components/dataView/Counter.stories.tsx
index e35775c22e8..fa63f18043b 100644
--- a/apps/meteor/client/components/dataView/Counter.stories.tsx
+++ b/apps/meteor/client/components/dataView/Counter.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import Counter from './Counter';
diff --git a/apps/meteor/client/components/dataView/Counter.tsx b/apps/meteor/client/components/dataView/Counter.tsx
index 7ade2f45e56..31a2ec01493 100644
--- a/apps/meteor/client/components/dataView/Counter.tsx
+++ b/apps/meteor/client/components/dataView/Counter.tsx
@@ -1,5 +1,6 @@
 import { Box, Flex, Margins } from '@rocket.chat/fuselage';
-import React, { ReactElement, ReactNode } from 'react';
+import type { ReactElement, ReactNode } from 'react';
+import React from 'react';
 
 import Growth from './Growth';
 
diff --git a/apps/meteor/client/components/dataView/CounterSet.stories.tsx b/apps/meteor/client/components/dataView/CounterSet.stories.tsx
index 9b72db1459c..eff2f491695 100644
--- a/apps/meteor/client/components/dataView/CounterSet.stories.tsx
+++ b/apps/meteor/client/components/dataView/CounterSet.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import CounterSet from './CounterSet';
diff --git a/apps/meteor/client/components/dataView/CounterSet.tsx b/apps/meteor/client/components/dataView/CounterSet.tsx
index ce3dc0a4279..74a938d38a5 100644
--- a/apps/meteor/client/components/dataView/CounterSet.tsx
+++ b/apps/meteor/client/components/dataView/CounterSet.tsx
@@ -1,5 +1,6 @@
 import { Grid } from '@rocket.chat/fuselage';
-import React, { ReactElement, ReactNode } from 'react';
+import type { ReactElement, ReactNode } from 'react';
+import React from 'react';
 
 import Counter from './Counter';
 
diff --git a/apps/meteor/client/components/dataView/Growth.stories.tsx b/apps/meteor/client/components/dataView/Growth.stories.tsx
index 41ac19c2d2c..21b2c066225 100644
--- a/apps/meteor/client/components/dataView/Growth.stories.tsx
+++ b/apps/meteor/client/components/dataView/Growth.stories.tsx
@@ -1,5 +1,5 @@
 import { Box } from '@rocket.chat/fuselage';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import { useAutoSequence } from '../../stories/hooks/useAutoSequence';
diff --git a/apps/meteor/client/components/dataView/Growth.tsx b/apps/meteor/client/components/dataView/Growth.tsx
index 78d734d53dd..074b8d63459 100644
--- a/apps/meteor/client/components/dataView/Growth.tsx
+++ b/apps/meteor/client/components/dataView/Growth.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { ComponentProps, ReactElement } from 'react';
+import type { ComponentProps, ReactElement } from 'react';
+import React from 'react';
 
 import NegativeGrowthSymbol from './NegativeGrowthSymbol';
 import PositiveGrowthSymbol from './PositiveGrowthSymbol';
diff --git a/apps/meteor/client/components/dataView/NegativeGrowthSymbol.stories.tsx b/apps/meteor/client/components/dataView/NegativeGrowthSymbol.stories.tsx
index 19a7096e6d1..43fefb943ac 100644
--- a/apps/meteor/client/components/dataView/NegativeGrowthSymbol.stories.tsx
+++ b/apps/meteor/client/components/dataView/NegativeGrowthSymbol.stories.tsx
@@ -1,5 +1,5 @@
 import { Box } from '@rocket.chat/fuselage';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import { useAutoSequence } from '../../stories/hooks/useAutoSequence';
diff --git a/apps/meteor/client/components/dataView/NegativeGrowthSymbol.tsx b/apps/meteor/client/components/dataView/NegativeGrowthSymbol.tsx
index 92d1258d5dd..4063763f66e 100644
--- a/apps/meteor/client/components/dataView/NegativeGrowthSymbol.tsx
+++ b/apps/meteor/client/components/dataView/NegativeGrowthSymbol.tsx
@@ -1,4 +1,5 @@
-import React, { ComponentProps, ReactElement } from 'react';
+import type { ComponentProps, ReactElement } from 'react';
+import React from 'react';
 
 const style = { width: '1.5em', height: '1.5em', verticalAlign: '-0.5em' };
 
diff --git a/apps/meteor/client/components/dataView/PositiveGrowthSymbol.stories.tsx b/apps/meteor/client/components/dataView/PositiveGrowthSymbol.stories.tsx
index bc3da573dd8..6d51da50737 100644
--- a/apps/meteor/client/components/dataView/PositiveGrowthSymbol.stories.tsx
+++ b/apps/meteor/client/components/dataView/PositiveGrowthSymbol.stories.tsx
@@ -1,5 +1,5 @@
 import { Box } from '@rocket.chat/fuselage';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import { useAutoSequence } from '../../stories/hooks/useAutoSequence';
diff --git a/apps/meteor/client/components/dataView/PositiveGrowthSymbol.tsx b/apps/meteor/client/components/dataView/PositiveGrowthSymbol.tsx
index 73bc5a8fc80..7001bfde19d 100644
--- a/apps/meteor/client/components/dataView/PositiveGrowthSymbol.tsx
+++ b/apps/meteor/client/components/dataView/PositiveGrowthSymbol.tsx
@@ -1,4 +1,5 @@
-import React, { ComponentProps, ReactElement } from 'react';
+import type { ComponentProps, ReactElement } from 'react';
+import React from 'react';
 
 const style = { width: '1.5em', height: '1.5em', verticalAlign: '-0.5em' };
 
diff --git a/apps/meteor/client/components/message/Attachments/ActionAttachmentButton.tsx b/apps/meteor/client/components/message/Attachments/ActionAttachmentButton.tsx
index b3288629fe1..6955c00eb36 100644
--- a/apps/meteor/client/components/message/Attachments/ActionAttachmentButton.tsx
+++ b/apps/meteor/client/components/message/Attachments/ActionAttachmentButton.tsx
@@ -1,8 +1,10 @@
-import { IMessage, MessageAttachmentAction } from '@rocket.chat/core-typings';
+import type { IMessage, MessageAttachmentAction } from '@rocket.chat/core-typings';
 import { Button } from '@rocket.chat/fuselage';
 import { useToastMessageDispatch } from '@rocket.chat/ui-contexts';
-import { useMutation, UseMutationOptions, UseMutationResult } from '@tanstack/react-query';
-import React, { ReactElement, ReactNode } from 'react';
+import type { UseMutationOptions, UseMutationResult } from '@tanstack/react-query';
+import { useMutation } from '@tanstack/react-query';
+import type { ReactElement, ReactNode } from 'react';
+import React from 'react';
 
 import { useChat } from '../../../views/room/contexts/ChatContext';
 
diff --git a/apps/meteor/client/components/message/Attachments/ActionAttachtment.tsx b/apps/meteor/client/components/message/Attachments/ActionAttachtment.tsx
index 618900169ec..e726cbb2df2 100644
--- a/apps/meteor/client/components/message/Attachments/ActionAttachtment.tsx
+++ b/apps/meteor/client/components/message/Attachments/ActionAttachtment.tsx
@@ -1,6 +1,7 @@
-import { MessageAttachmentAction } from '@rocket.chat/core-typings';
+import type { MessageAttachmentAction } from '@rocket.chat/core-typings';
 import { Box, Button, ButtonGroup } from '@rocket.chat/fuselage';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import ActionAttachmentButton from './ActionAttachmentButton';
 
diff --git a/apps/meteor/client/components/message/Attachments/Attachment/Attachment.tsx b/apps/meteor/client/components/message/Attachments/Attachment/Attachment.tsx
index d79ecac8e56..aa4509f9c7c 100644
--- a/apps/meteor/client/components/message/Attachments/Attachment/Attachment.tsx
+++ b/apps/meteor/client/components/message/Attachments/Attachment/Attachment.tsx
@@ -1,7 +1,8 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box } from '@rocket.chat/fuselage';
 import { useAttachmentDimensions } from '@rocket.chat/ui-contexts';
-import React, { ComponentProps, FC } from 'react';
+import type { ComponentProps, FC } from 'react';
+import React from 'react';
 
 const className = css`
 	white-space: normal;
diff --git a/apps/meteor/client/components/message/Attachments/Attachment/AttachmentAction.tsx b/apps/meteor/client/components/message/Attachments/Attachment/AttachmentAction.tsx
index e8d1d8f7a50..168a5da5bcf 100644
--- a/apps/meteor/client/components/message/Attachments/Attachment/AttachmentAction.tsx
+++ b/apps/meteor/client/components/message/Attachments/Attachment/AttachmentAction.tsx
@@ -1,5 +1,6 @@
 import { IconButton } from '@rocket.chat/fuselage';
-import React, { ComponentProps, FC } from 'react';
+import type { ComponentProps, FC } from 'react';
+import React from 'react';
 
 const AttachmentAction: FC<ComponentProps<typeof IconButton> & { icon: string }> = (props) => <IconButton mi='x2' mini {...props} />;
 
diff --git a/apps/meteor/client/components/message/Attachments/Attachment/AttachmentAuthor.tsx b/apps/meteor/client/components/message/Attachments/Attachment/AttachmentAuthor.tsx
index cf510147a55..2f9103e356b 100644
--- a/apps/meteor/client/components/message/Attachments/Attachment/AttachmentAuthor.tsx
+++ b/apps/meteor/client/components/message/Attachments/Attachment/AttachmentAuthor.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { ComponentProps, FC } from 'react';
+import type { ComponentProps, FC } from 'react';
+import React from 'react';
 
 const AttachmentAuthor: FC<ComponentProps<typeof Box>> = (props) => (
 	<Box display='flex' flexDirection='row' alignItems='center' mbe='x4' {...props} />
diff --git a/apps/meteor/client/components/message/Attachments/Attachment/AttachmentAuthorAvatar.tsx b/apps/meteor/client/components/message/Attachments/Attachment/AttachmentAuthorAvatar.tsx
index ff37bbaa670..ea1ae5a34c3 100644
--- a/apps/meteor/client/components/message/Attachments/Attachment/AttachmentAuthorAvatar.tsx
+++ b/apps/meteor/client/components/message/Attachments/Attachment/AttachmentAuthorAvatar.tsx
@@ -1,4 +1,5 @@
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import BaseAvatar from '../../../avatar/BaseAvatar';
 
diff --git a/apps/meteor/client/components/message/Attachments/Attachment/AttachmentAuthorName.tsx b/apps/meteor/client/components/message/Attachments/Attachment/AttachmentAuthorName.tsx
index 7b4e1970753..c5573269071 100644
--- a/apps/meteor/client/components/message/Attachments/Attachment/AttachmentAuthorName.tsx
+++ b/apps/meteor/client/components/message/Attachments/Attachment/AttachmentAuthorName.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { ComponentProps, FC } from 'react';
+import type { ComponentProps, FC } from 'react';
+import React from 'react';
 
 const AttachmentAuthorName: FC<ComponentProps<typeof Box>> = (props) => <Box withTruncatedText fontScale='p2m' mi='x8' {...props} />;
 
diff --git a/apps/meteor/client/components/message/Attachments/Attachment/AttachmentBlock.tsx b/apps/meteor/client/components/message/Attachments/Attachment/AttachmentBlock.tsx
index 12ce271a457..407dbf2234e 100644
--- a/apps/meteor/client/components/message/Attachments/Attachment/AttachmentBlock.tsx
+++ b/apps/meteor/client/components/message/Attachments/Attachment/AttachmentBlock.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import Attachment from './Attachment';
 
diff --git a/apps/meteor/client/components/message/Attachments/Attachment/AttachmentCollapse.tsx b/apps/meteor/client/components/message/Attachments/Attachment/AttachmentCollapse.tsx
index 6ea3e1c44b0..3437ed8d60d 100644
--- a/apps/meteor/client/components/message/Attachments/Attachment/AttachmentCollapse.tsx
+++ b/apps/meteor/client/components/message/Attachments/Attachment/AttachmentCollapse.tsx
@@ -1,5 +1,6 @@
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ComponentProps, FC } from 'react';
+import type { ComponentProps, FC } from 'react';
+import React from 'react';
 
 import Action from './AttachmentAction';
 
diff --git a/apps/meteor/client/components/message/Attachments/Attachment/AttachmentContent.tsx b/apps/meteor/client/components/message/Attachments/Attachment/AttachmentContent.tsx
index 26625e53cf2..0d89a274901 100644
--- a/apps/meteor/client/components/message/Attachments/Attachment/AttachmentContent.tsx
+++ b/apps/meteor/client/components/message/Attachments/Attachment/AttachmentContent.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { ComponentProps, FC } from 'react';
+import type { ComponentProps, FC } from 'react';
+import React from 'react';
 
 const AttachmentContent: FC<ComponentProps<typeof Box>> = ({ ...props }) => <Box rcx-attachment__content width='full' mb='x4' {...props} />;
 
diff --git a/apps/meteor/client/components/message/Attachments/Attachment/AttachmentDescription.tsx b/apps/meteor/client/components/message/Attachments/Attachment/AttachmentDescription.tsx
index ed9247f76a7..b15db7842c3 100644
--- a/apps/meteor/client/components/message/Attachments/Attachment/AttachmentDescription.tsx
+++ b/apps/meteor/client/components/message/Attachments/Attachment/AttachmentDescription.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { ComponentProps, ReactElement } from 'react';
+import type { ComponentProps, ReactElement } from 'react';
+import React from 'react';
 
 const AttachmentDescription = ({ ...props }: ComponentProps<typeof Box>): ReactElement => (
 	<Box rcx-attachment__description data-qa-type='attachment-description' mbe='x4' color='default' {...props} />
diff --git a/apps/meteor/client/components/message/Attachments/Attachment/AttachmentDetails.tsx b/apps/meteor/client/components/message/Attachments/Attachment/AttachmentDetails.tsx
index 1da2a70ec25..2d4a8426a12 100644
--- a/apps/meteor/client/components/message/Attachments/Attachment/AttachmentDetails.tsx
+++ b/apps/meteor/client/components/message/Attachments/Attachment/AttachmentDetails.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { FC, ComponentProps } from 'react';
+import type { FC, ComponentProps } from 'react';
+import React from 'react';
 
 const AttachmentDetails: FC<ComponentProps<typeof Box>> = ({ ...props }) => (
 	<Box rcx-attachment__details fontScale='p2' color='hint' bg='surface-tint' pi='x16' pb='x16' {...props} />
diff --git a/apps/meteor/client/components/message/Attachments/Attachment/AttachmentDownload.tsx b/apps/meteor/client/components/message/Attachments/Attachment/AttachmentDownload.tsx
index 68249f57472..8c3636ef256 100644
--- a/apps/meteor/client/components/message/Attachments/Attachment/AttachmentDownload.tsx
+++ b/apps/meteor/client/components/message/Attachments/Attachment/AttachmentDownload.tsx
@@ -1,5 +1,6 @@
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ComponentProps, FC } from 'react';
+import type { ComponentProps, FC } from 'react';
+import React from 'react';
 
 import Action from './AttachmentAction';
 
diff --git a/apps/meteor/client/components/message/Attachments/Attachment/AttachmentInner.tsx b/apps/meteor/client/components/message/Attachments/Attachment/AttachmentInner.tsx
index 0b9e7aaaabe..5bd47294cf9 100644
--- a/apps/meteor/client/components/message/Attachments/Attachment/AttachmentInner.tsx
+++ b/apps/meteor/client/components/message/Attachments/Attachment/AttachmentInner.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { ComponentProps, FC } from 'react';
+import type { ComponentProps, FC } from 'react';
+import React from 'react';
 
 const AttachmentInner: FC<ComponentProps<typeof Box>> = ({ ...props }) => <Box {...props} />;
 
diff --git a/apps/meteor/client/components/message/Attachments/Attachment/AttachmentRow.tsx b/apps/meteor/client/components/message/Attachments/Attachment/AttachmentRow.tsx
index ac5ac4bc762..48e5d06639a 100644
--- a/apps/meteor/client/components/message/Attachments/Attachment/AttachmentRow.tsx
+++ b/apps/meteor/client/components/message/Attachments/Attachment/AttachmentRow.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { FC, ComponentProps } from 'react';
+import type { FC, ComponentProps } from 'react';
+import React from 'react';
 
 const AttachmentRow: FC<ComponentProps<typeof Box>> = (props) => (
 	<Box mi='neg-x2' mbe='x2' rcx-message-attachment display='flex' alignItems='center' {...props} />
diff --git a/apps/meteor/client/components/message/Attachments/Attachment/AttachmentSize.tsx b/apps/meteor/client/components/message/Attachments/Attachment/AttachmentSize.tsx
index 5dbe8b107f5..e3a43348217 100644
--- a/apps/meteor/client/components/message/Attachments/Attachment/AttachmentSize.tsx
+++ b/apps/meteor/client/components/message/Attachments/Attachment/AttachmentSize.tsx
@@ -1,5 +1,6 @@
-import { Box } from '@rocket.chat/fuselage';
-import React, { ComponentProps, FC } from 'react';
+import type { Box } from '@rocket.chat/fuselage';
+import type { ComponentProps, FC } from 'react';
+import React from 'react';
 
 import { useFormatMemorySize } from '../../../../hooks/useFormatMemorySize';
 import Title from './AttachmentTitle';
diff --git a/apps/meteor/client/components/message/Attachments/Attachment/AttachmentText.tsx b/apps/meteor/client/components/message/Attachments/Attachment/AttachmentText.tsx
index b144df13b2c..e604f35b662 100644
--- a/apps/meteor/client/components/message/Attachments/Attachment/AttachmentText.tsx
+++ b/apps/meteor/client/components/message/Attachments/Attachment/AttachmentText.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { ComponentProps, FC } from 'react';
+import type { ComponentProps, FC } from 'react';
+import React from 'react';
 
 const AttachmentText: FC<ComponentProps<typeof Box>> = (props) => <Box mbe='x4' mi='x2' fontScale='p2' color='default' {...props}></Box>;
 
diff --git a/apps/meteor/client/components/message/Attachments/Attachment/AttachmentThumb.tsx b/apps/meteor/client/components/message/Attachments/Attachment/AttachmentThumb.tsx
index 712cd575dd9..4c6d7b3a5fa 100644
--- a/apps/meteor/client/components/message/Attachments/Attachment/AttachmentThumb.tsx
+++ b/apps/meteor/client/components/message/Attachments/Attachment/AttachmentThumb.tsx
@@ -1,5 +1,6 @@
 import { Box, Avatar } from '@rocket.chat/fuselage';
-import React, { FC, memo } from 'react';
+import type { FC } from 'react';
+import React, { memo } from 'react';
 
 const AttachmentThumb: FC<{ url: string }> = ({ url }) => (
 	<Box mis='x8'>
diff --git a/apps/meteor/client/components/message/Attachments/Attachment/AttachmentTitle.tsx b/apps/meteor/client/components/message/Attachments/Attachment/AttachmentTitle.tsx
index 85db6c0d181..0443c1ed0c6 100644
--- a/apps/meteor/client/components/message/Attachments/Attachment/AttachmentTitle.tsx
+++ b/apps/meteor/client/components/message/Attachments/Attachment/AttachmentTitle.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { ComponentProps, FC } from 'react';
+import type { ComponentProps, FC } from 'react';
+import React from 'react';
 
 const AttachmentTitle: FC<ComponentProps<typeof Box>> = (props) => (
 	<Box withTruncatedText mi='x2' fontScale='c1' color='hint' {...props}></Box>
diff --git a/apps/meteor/client/components/message/Attachments/Attachment/AttachmentTitleLink.tsx b/apps/meteor/client/components/message/Attachments/Attachment/AttachmentTitleLink.tsx
index d4d35b24bef..effc4dd44d5 100644
--- a/apps/meteor/client/components/message/Attachments/Attachment/AttachmentTitleLink.tsx
+++ b/apps/meteor/client/components/message/Attachments/Attachment/AttachmentTitleLink.tsx
@@ -1,4 +1,5 @@
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import Title from './AttachmentTitle';
 
diff --git a/apps/meteor/client/components/message/Attachments/Attachments.stories.tsx b/apps/meteor/client/components/message/Attachments/Attachments.stories.tsx
index 73e29b0559c..9f2d9e5ba65 100644
--- a/apps/meteor/client/components/message/Attachments/Attachments.stories.tsx
+++ b/apps/meteor/client/components/message/Attachments/Attachments.stories.tsx
@@ -1,5 +1,5 @@
-import { FileAttachmentProps, FileProp, MessageAttachmentDefault } from '@rocket.chat/core-typings';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { FileAttachmentProps, FileProp, MessageAttachmentDefault } from '@rocket.chat/core-typings';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import Attachments from '.';
diff --git a/apps/meteor/client/components/message/Attachments/Attachments.tsx b/apps/meteor/client/components/message/Attachments/Attachments.tsx
index 913579861da..d7302ea3589 100644
--- a/apps/meteor/client/components/message/Attachments/Attachments.tsx
+++ b/apps/meteor/client/components/message/Attachments/Attachments.tsx
@@ -1,5 +1,6 @@
-import { FileProp, MessageAttachmentBase } from '@rocket.chat/core-typings';
-import React, { ContextType, ReactElement, useContext } from 'react';
+import type { FileProp, MessageAttachmentBase } from '@rocket.chat/core-typings';
+import type { ContextType, ReactElement } from 'react';
+import React, { useContext } from 'react';
 
 import { ChatContext } from '../../../views/room/contexts/ChatContext';
 import { MessageContext } from '../../../views/room/contexts/MessageContext';
diff --git a/apps/meteor/client/components/message/Attachments/DefaultAttachment.tsx b/apps/meteor/client/components/message/Attachments/DefaultAttachment.tsx
index 618a4d787ed..92903b734c0 100644
--- a/apps/meteor/client/components/message/Attachments/DefaultAttachment.tsx
+++ b/apps/meteor/client/components/message/Attachments/DefaultAttachment.tsx
@@ -1,5 +1,7 @@
-import { isActionAttachment, MarkdownFields, MessageAttachmentDefault } from '@rocket.chat/core-typings';
-import React, { FC, ReactNode, ComponentProps } from 'react';
+import type { MarkdownFields, MessageAttachmentDefault } from '@rocket.chat/core-typings';
+import { isActionAttachment } from '@rocket.chat/core-typings';
+import type { FC, ReactNode, ComponentProps } from 'react';
+import React from 'react';
 
 import MarkdownText from '../../MarkdownText';
 import { ActionAttachment } from './ActionAttachtment';
diff --git a/apps/meteor/client/components/message/Attachments/FieldsAttachment/Field.tsx b/apps/meteor/client/components/message/Attachments/FieldsAttachment/Field.tsx
index 51ce8079950..63a985a2bf9 100644
--- a/apps/meteor/client/components/message/Attachments/FieldsAttachment/Field.tsx
+++ b/apps/meteor/client/components/message/Attachments/FieldsAttachment/Field.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { ComponentProps, FC, ReactNode } from 'react';
+import type { ComponentProps, FC, ReactNode } from 'react';
+import React from 'react';
 
 type FieldProps = {
 	short?: boolean;
diff --git a/apps/meteor/client/components/message/Attachments/FieldsAttachment/ShortField.tsx b/apps/meteor/client/components/message/Attachments/FieldsAttachment/ShortField.tsx
index 7af5ba276a7..f9fb7b48a70 100644
--- a/apps/meteor/client/components/message/Attachments/FieldsAttachment/ShortField.tsx
+++ b/apps/meteor/client/components/message/Attachments/FieldsAttachment/ShortField.tsx
@@ -1,4 +1,5 @@
-import React, { ComponentProps, FC } from 'react';
+import type { ComponentProps, FC } from 'react';
+import React from 'react';
 
 import Field from './Field';
 
diff --git a/apps/meteor/client/components/message/Attachments/FieldsAttachment/index.tsx b/apps/meteor/client/components/message/Attachments/FieldsAttachment/index.tsx
index 11cd762c084..7b2e0c096b9 100644
--- a/apps/meteor/client/components/message/Attachments/FieldsAttachment/index.tsx
+++ b/apps/meteor/client/components/message/Attachments/FieldsAttachment/index.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { FC, ReactNode } from 'react';
+import type { FC, ReactNode } from 'react';
+import React from 'react';
 
 import Field from './Field';
 import ShortField from './ShortField';
diff --git a/apps/meteor/client/components/message/Attachments/Files/AudioAttachment.tsx b/apps/meteor/client/components/message/Attachments/Files/AudioAttachment.tsx
index d8d63747cd3..caf804ae3ec 100644
--- a/apps/meteor/client/components/message/Attachments/Files/AudioAttachment.tsx
+++ b/apps/meteor/client/components/message/Attachments/Files/AudioAttachment.tsx
@@ -1,6 +1,7 @@
-import { AudioAttachmentProps } from '@rocket.chat/core-typings';
+import type { AudioAttachmentProps } from '@rocket.chat/core-typings';
 import { useMediaUrl } from '@rocket.chat/ui-contexts';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import MarkdownText from '../../../MarkdownText';
 import Attachment from '../Attachment';
diff --git a/apps/meteor/client/components/message/Attachments/Files/GenericFileAttachment.tsx b/apps/meteor/client/components/message/Attachments/Files/GenericFileAttachment.tsx
index 5cffc1016c8..581364fe597 100644
--- a/apps/meteor/client/components/message/Attachments/Files/GenericFileAttachment.tsx
+++ b/apps/meteor/client/components/message/Attachments/Files/GenericFileAttachment.tsx
@@ -1,6 +1,7 @@
-import { FileProp, MessageAttachmentBase } from '@rocket.chat/core-typings';
+import type { FileProp, MessageAttachmentBase } from '@rocket.chat/core-typings';
 import { useMediaUrl } from '@rocket.chat/ui-contexts';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import MarkdownText from '../../../MarkdownText';
 import Attachment from '../Attachment';
diff --git a/apps/meteor/client/components/message/Attachments/Files/ImageAttachment.tsx b/apps/meteor/client/components/message/Attachments/Files/ImageAttachment.tsx
index 0665c1b232c..153be2ae385 100644
--- a/apps/meteor/client/components/message/Attachments/Files/ImageAttachment.tsx
+++ b/apps/meteor/client/components/message/Attachments/Files/ImageAttachment.tsx
@@ -1,6 +1,7 @@
-import { ImageAttachmentProps } from '@rocket.chat/core-typings';
+import type { ImageAttachmentProps } from '@rocket.chat/core-typings';
 import { useMediaUrl } from '@rocket.chat/ui-contexts';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import MarkdownText from '../../../MarkdownText';
 import Attachment from '../Attachment';
diff --git a/apps/meteor/client/components/message/Attachments/Files/VideoAttachment.tsx b/apps/meteor/client/components/message/Attachments/Files/VideoAttachment.tsx
index 54aceb0d099..63e57bc94d2 100644
--- a/apps/meteor/client/components/message/Attachments/Files/VideoAttachment.tsx
+++ b/apps/meteor/client/components/message/Attachments/Files/VideoAttachment.tsx
@@ -1,8 +1,9 @@
-import { VideoAttachmentProps } from '@rocket.chat/core-typings';
+import type { VideoAttachmentProps } from '@rocket.chat/core-typings';
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Palette } from '@rocket.chat/fuselage';
 import { useMediaUrl } from '@rocket.chat/ui-contexts';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import { userAgentMIMETypeFallback } from '../../../../lib/utils/userAgentMIMETypeFallback';
 import MarkdownText from '../../../MarkdownText';
diff --git a/apps/meteor/client/components/message/Attachments/Files/index.tsx b/apps/meteor/client/components/message/Attachments/Files/index.tsx
index 4e1eecf1991..21f2d94e561 100644
--- a/apps/meteor/client/components/message/Attachments/Files/index.tsx
+++ b/apps/meteor/client/components/message/Attachments/Files/index.tsx
@@ -1,5 +1,7 @@
-import { isFileAudioAttachment, FileAttachmentProps, isFileImageAttachment, isFileVideoAttachment } from '@rocket.chat/core-typings';
-import React, { FC } from 'react';
+import type { FileAttachmentProps } from '@rocket.chat/core-typings';
+import { isFileAudioAttachment, isFileImageAttachment, isFileVideoAttachment } from '@rocket.chat/core-typings';
+import type { FC } from 'react';
+import React from 'react';
 
 import { AudioAttachment } from './AudioAttachment';
 import { GenericFileAttachment } from './GenericFileAttachment';
diff --git a/apps/meteor/client/components/message/Attachments/Item.tsx b/apps/meteor/client/components/message/Attachments/Item.tsx
index 8e144cf82e3..4f7326db7ae 100644
--- a/apps/meteor/client/components/message/Attachments/Item.tsx
+++ b/apps/meteor/client/components/message/Attachments/Item.tsx
@@ -1,5 +1,7 @@
-import { isFileAttachment, FileProp, MessageAttachmentBase, isQuoteAttachment } from '@rocket.chat/core-typings';
-import React, { memo, ReactElement } from 'react';
+import type { FileProp, MessageAttachmentBase } from '@rocket.chat/core-typings';
+import { isFileAttachment, isQuoteAttachment } from '@rocket.chat/core-typings';
+import type { ReactElement } from 'react';
+import React, { memo } from 'react';
 
 import DefaultAttachment from './DefaultAttachment';
 import { FileAttachment } from './Files';
diff --git a/apps/meteor/client/components/message/Attachments/QuoteAttachment.tsx b/apps/meteor/client/components/message/Attachments/QuoteAttachment.tsx
index 04c0c9ce77a..6eabecf070e 100644
--- a/apps/meteor/client/components/message/Attachments/QuoteAttachment.tsx
+++ b/apps/meteor/client/components/message/Attachments/QuoteAttachment.tsx
@@ -1,7 +1,8 @@
-import { MessageQuoteAttachment } from '@rocket.chat/core-typings';
+import type { MessageQuoteAttachment } from '@rocket.chat/core-typings';
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Palette } from '@rocket.chat/fuselage';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import Attachments from '.';
 import { useTimeAgo } from '../../../hooks/useTimeAgo';
diff --git a/apps/meteor/client/components/message/Attachments/components/Image.tsx b/apps/meteor/client/components/message/Attachments/components/Image.tsx
index 8da784cd4f9..46362580cb0 100644
--- a/apps/meteor/client/components/message/Attachments/components/Image.tsx
+++ b/apps/meteor/client/components/message/Attachments/components/Image.tsx
@@ -1,6 +1,7 @@
-import { Dimensions } from '@rocket.chat/core-typings';
+import type { Dimensions } from '@rocket.chat/core-typings';
 import { useAttachmentDimensions } from '@rocket.chat/ui-contexts';
-import React, { memo, FC, useState, useMemo } from 'react';
+import type { FC } from 'react';
+import React, { memo, useState, useMemo } from 'react';
 
 import ImageBox from './ImageBox';
 import Load from './Load';
diff --git a/apps/meteor/client/components/message/Attachments/components/ImageBox.tsx b/apps/meteor/client/components/message/Attachments/components/ImageBox.tsx
index 5fd1b36578c..a73768d6a39 100644
--- a/apps/meteor/client/components/message/Attachments/components/ImageBox.tsx
+++ b/apps/meteor/client/components/message/Attachments/components/ImageBox.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { ComponentProps, FC } from 'react';
+import type { ComponentProps, FC } from 'react';
+import React from 'react';
 
 const ImageBox: FC<ComponentProps<typeof Box>> = (props) => (
 	<Box
diff --git a/apps/meteor/client/components/message/Attachments/components/Load.tsx b/apps/meteor/client/components/message/Attachments/components/Load.tsx
index 9c5e8ec3261..c3a943a15a0 100644
--- a/apps/meteor/client/components/message/Attachments/components/Load.tsx
+++ b/apps/meteor/client/components/message/Attachments/components/Load.tsx
@@ -1,7 +1,8 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Icon, Palette } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ComponentProps, FC } from 'react';
+import type { ComponentProps, FC } from 'react';
+import React from 'react';
 
 import ImageBox from './ImageBox';
 
diff --git a/apps/meteor/client/components/message/Attachments/components/Retry.stories.tsx b/apps/meteor/client/components/message/Attachments/components/Retry.stories.tsx
index 46101b30a33..d1f6db72f32 100644
--- a/apps/meteor/client/components/message/Attachments/components/Retry.stories.tsx
+++ b/apps/meteor/client/components/message/Attachments/components/Retry.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import Retry from './Retry';
diff --git a/apps/meteor/client/components/message/Attachments/components/Retry.tsx b/apps/meteor/client/components/message/Attachments/components/Retry.tsx
index a1abe0247b7..7e92618c5c9 100644
--- a/apps/meteor/client/components/message/Attachments/components/Retry.tsx
+++ b/apps/meteor/client/components/message/Attachments/components/Retry.tsx
@@ -1,7 +1,8 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Icon, Palette } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, ComponentProps } from 'react';
+import type { FC, ComponentProps } from 'react';
+import React from 'react';
 
 import ImageBox from './ImageBox';
 
diff --git a/apps/meteor/client/components/message/Attachments/providers/AttachmentProvider.tsx b/apps/meteor/client/components/message/Attachments/providers/AttachmentProvider.tsx
index a287017b85b..00df82e9bb5 100644
--- a/apps/meteor/client/components/message/Attachments/providers/AttachmentProvider.tsx
+++ b/apps/meteor/client/components/message/Attachments/providers/AttachmentProvider.tsx
@@ -1,6 +1,8 @@
 import { usePrefersReducedData } from '@rocket.chat/fuselage-hooks';
-import { AttachmentContext, AttachmentContextValue, useLayout, useUserPreference } from '@rocket.chat/ui-contexts';
-import React, { useMemo, FC } from 'react';
+import type { AttachmentContextValue } from '@rocket.chat/ui-contexts';
+import { AttachmentContext, useLayout, useUserPreference } from '@rocket.chat/ui-contexts';
+import type { FC } from 'react';
+import React, { useMemo } from 'react';
 
 import { getURL } from '../../../../../app/utils/client';
 
diff --git a/apps/meteor/client/components/message/MessageActions/Action.tsx b/apps/meteor/client/components/message/MessageActions/Action.tsx
index 3a205adde4b..fb6138287aa 100644
--- a/apps/meteor/client/components/message/MessageActions/Action.tsx
+++ b/apps/meteor/client/components/message/MessageActions/Action.tsx
@@ -1,6 +1,9 @@
-import { IconProps, Icon, Button } from '@rocket.chat/fuselage';
-import { TranslationKey, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC } from 'react';
+import type { IconProps } from '@rocket.chat/fuselage';
+import { Icon, Button } from '@rocket.chat/fuselage';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
+import type { FC } from 'react';
+import React from 'react';
 
 type RunAction = (action: string) => () => void;
 
diff --git a/apps/meteor/client/components/message/MessageActions/Actions.tsx b/apps/meteor/client/components/message/MessageActions/Actions.tsx
index bf9c27674cb..5d8ec6aa976 100644
--- a/apps/meteor/client/components/message/MessageActions/Actions.tsx
+++ b/apps/meteor/client/components/message/MessageActions/Actions.tsx
@@ -1,6 +1,8 @@
-import { IconProps, ButtonGroup } from '@rocket.chat/fuselage';
-import { TranslationKey } from '@rocket.chat/ui-contexts';
-import React, { FC } from 'react';
+import type { IconProps } from '@rocket.chat/fuselage';
+import { ButtonGroup } from '@rocket.chat/fuselage';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import type { FC } from 'react';
+import React from 'react';
 
 import Content from '../Metrics/Content';
 import Action from './Action';
diff --git a/apps/meteor/client/components/message/Metrics/Broadcast.tsx b/apps/meteor/client/components/message/Metrics/Broadcast.tsx
index 191de087004..b29d38cfc6b 100644
--- a/apps/meteor/client/components/message/Metrics/Broadcast.tsx
+++ b/apps/meteor/client/components/message/Metrics/Broadcast.tsx
@@ -1,5 +1,6 @@
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import { useBlockRendered } from '../hooks/useBlockRendered';
 import Content from './Content';
diff --git a/apps/meteor/client/components/message/Metrics/Content.tsx b/apps/meteor/client/components/message/Metrics/Content.tsx
index 2f1858ca798..776cf755f75 100644
--- a/apps/meteor/client/components/message/Metrics/Content.tsx
+++ b/apps/meteor/client/components/message/Metrics/Content.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { ComponentProps, FC } from 'react';
+import type { ComponentProps, FC } from 'react';
+import React from 'react';
 
 type ContentProps = ComponentProps<typeof Box>;
 
diff --git a/apps/meteor/client/components/message/Metrics/ContentItem.tsx b/apps/meteor/client/components/message/Metrics/ContentItem.tsx
index 62207407494..d1c933af446 100644
--- a/apps/meteor/client/components/message/Metrics/ContentItem.tsx
+++ b/apps/meteor/client/components/message/Metrics/ContentItem.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { ComponentProps, FC } from 'react';
+import type { ComponentProps, FC } from 'react';
+import React from 'react';
 
 type ContentItemProps = ComponentProps<typeof Box>;
 
diff --git a/apps/meteor/client/components/message/Metrics/Discussion.tsx b/apps/meteor/client/components/message/Metrics/Discussion.tsx
index 41b6cbb8e16..d16814d346d 100644
--- a/apps/meteor/client/components/message/Metrics/Discussion.tsx
+++ b/apps/meteor/client/components/message/Metrics/Discussion.tsx
@@ -1,6 +1,7 @@
 import { Message } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, UIEvent } from 'react';
+import type { FC, UIEvent } from 'react';
+import React from 'react';
 
 import { useTimeAgo } from '../../../hooks/useTimeAgo';
 import { useBlockRendered } from '../hooks/useBlockRendered';
diff --git a/apps/meteor/client/components/message/Metrics/Metrics.tsx b/apps/meteor/client/components/message/Metrics/Metrics.tsx
index 2c76fda34d2..26c875d1bb9 100644
--- a/apps/meteor/client/components/message/Metrics/Metrics.tsx
+++ b/apps/meteor/client/components/message/Metrics/Metrics.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { ComponentProps, FC } from 'react';
+import type { ComponentProps, FC } from 'react';
+import React from 'react';
 
 import ContentItem from './ContentItem';
 
diff --git a/apps/meteor/client/components/message/Metrics/MetricsFollowing.tsx b/apps/meteor/client/components/message/Metrics/MetricsFollowing.tsx
index 371f3438cf8..8bd89aae952 100644
--- a/apps/meteor/client/components/message/Metrics/MetricsFollowing.tsx
+++ b/apps/meteor/client/components/message/Metrics/MetricsFollowing.tsx
@@ -1,5 +1,6 @@
 import { IconButton } from '@rocket.chat/fuselage';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 type MetricsFollowingProps = { name: 'bell' | 'bell-off' };
 
diff --git a/apps/meteor/client/components/message/Metrics/MetricsItem.tsx b/apps/meteor/client/components/message/Metrics/MetricsItem.tsx
index a54911c96bc..ac5330b68df 100644
--- a/apps/meteor/client/components/message/Metrics/MetricsItem.tsx
+++ b/apps/meteor/client/components/message/Metrics/MetricsItem.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { ComponentProps, FC } from 'react';
+import type { ComponentProps, FC } from 'react';
+import React from 'react';
 
 type MetricsItemProps = ComponentProps<typeof Box>;
 
diff --git a/apps/meteor/client/components/message/Metrics/MetricsItemIcon.tsx b/apps/meteor/client/components/message/Metrics/MetricsItemIcon.tsx
index f95572641b2..010bb5c593c 100644
--- a/apps/meteor/client/components/message/Metrics/MetricsItemIcon.tsx
+++ b/apps/meteor/client/components/message/Metrics/MetricsItemIcon.tsx
@@ -1,5 +1,6 @@
 import { Icon } from '@rocket.chat/fuselage';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 type MetricsItemIconProps = { name: 'thread' | 'user' | 'clock' | 'discussion' | 'bell' };
 
diff --git a/apps/meteor/client/components/message/Metrics/MetricsItemLabel.tsx b/apps/meteor/client/components/message/Metrics/MetricsItemLabel.tsx
index 425d50b0f04..7182cd6181f 100644
--- a/apps/meteor/client/components/message/Metrics/MetricsItemLabel.tsx
+++ b/apps/meteor/client/components/message/Metrics/MetricsItemLabel.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { ComponentProps, FC } from 'react';
+import type { ComponentProps, FC } from 'react';
+import React from 'react';
 
 type MetricsItemLabelProps = ComponentProps<typeof Box>;
 
diff --git a/apps/meteor/client/components/message/Metrics/Reply.tsx b/apps/meteor/client/components/message/Metrics/Reply.tsx
index 741e4fe6488..511cecb3315 100644
--- a/apps/meteor/client/components/message/Metrics/Reply.tsx
+++ b/apps/meteor/client/components/message/Metrics/Reply.tsx
@@ -1,5 +1,6 @@
 import { Button } from '@rocket.chat/fuselage';
-import React, { ComponentProps, FC } from 'react';
+import type { ComponentProps, FC } from 'react';
+import React from 'react';
 
 import ContentItem from './ContentItem';
 
diff --git a/apps/meteor/client/components/message/Metrics/Thread.tsx b/apps/meteor/client/components/message/Metrics/Thread.tsx
index 702c508a59f..2e1dfc48b1a 100644
--- a/apps/meteor/client/components/message/Metrics/Thread.tsx
+++ b/apps/meteor/client/components/message/Metrics/Thread.tsx
@@ -1,6 +1,7 @@
 import { Message, MessageMetricsItem, MessageBlock } from '@rocket.chat/fuselage';
 import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useCallback, FC, MouseEvent as ReactMouseEvent } from 'react';
+import type { FC, MouseEvent as ReactMouseEvent } from 'react';
+import React, { useCallback } from 'react';
 
 import { useTimeAgo } from '../../../hooks/useTimeAgo';
 import * as NotificationStatus from '../NotificationStatus';
diff --git a/apps/meteor/client/components/message/NotificationStatus/All.tsx b/apps/meteor/client/components/message/NotificationStatus/All.tsx
index 7475145b153..da0d2fbc8a5 100644
--- a/apps/meteor/client/components/message/NotificationStatus/All.tsx
+++ b/apps/meteor/client/components/message/NotificationStatus/All.tsx
@@ -1,4 +1,5 @@
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import NotificationStatus from './NotificationStatus';
 
diff --git a/apps/meteor/client/components/message/NotificationStatus/Me.tsx b/apps/meteor/client/components/message/NotificationStatus/Me.tsx
index eca85561654..dd3e283baef 100644
--- a/apps/meteor/client/components/message/NotificationStatus/Me.tsx
+++ b/apps/meteor/client/components/message/NotificationStatus/Me.tsx
@@ -1,4 +1,5 @@
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import NotificationStatus from './NotificationStatus';
 
diff --git a/apps/meteor/client/components/message/NotificationStatus/NotificationStatus.tsx b/apps/meteor/client/components/message/NotificationStatus/NotificationStatus.tsx
index aee9f48b8e4..16b0d47699b 100644
--- a/apps/meteor/client/components/message/NotificationStatus/NotificationStatus.tsx
+++ b/apps/meteor/client/components/message/NotificationStatus/NotificationStatus.tsx
@@ -1,6 +1,8 @@
 import { Box } from '@rocket.chat/fuselage';
-import { TranslationKey, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC } from 'react';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
+import type { FC } from 'react';
+import React from 'react';
 
 const NotificationStatus: FC<{
 	label: TranslationKey;
diff --git a/apps/meteor/client/components/message/NotificationStatus/Unread.tsx b/apps/meteor/client/components/message/NotificationStatus/Unread.tsx
index 197f1830793..693bda47cb2 100644
--- a/apps/meteor/client/components/message/NotificationStatus/Unread.tsx
+++ b/apps/meteor/client/components/message/NotificationStatus/Unread.tsx
@@ -1,4 +1,5 @@
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import NotificationStatus from './NotificationStatus';
 
diff --git a/apps/meteor/client/components/message/hooks/useBlockRendered.ts b/apps/meteor/client/components/message/hooks/useBlockRendered.ts
index 3d35443aa53..0cf6b63f6de 100644
--- a/apps/meteor/client/components/message/hooks/useBlockRendered.ts
+++ b/apps/meteor/client/components/message/hooks/useBlockRendered.ts
@@ -1,4 +1,5 @@
-import { useRef, useEffect, RefObject } from 'react';
+import type { RefObject } from 'react';
+import { useRef, useEffect } from 'react';
 
 // @deprecated
 export const useBlockRendered = <T extends HTMLElement>(): {
diff --git a/apps/meteor/client/components/modal/ModalBackdrop.tsx b/apps/meteor/client/components/modal/ModalBackdrop.tsx
index fa7641da80f..aeb8599dfef 100644
--- a/apps/meteor/client/components/modal/ModalBackdrop.tsx
+++ b/apps/meteor/client/components/modal/ModalBackdrop.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { MouseEvent, ReactElement, ReactNode, RefObject, useCallback, useEffect, useRef } from 'react';
+import type { MouseEvent, ReactElement, ReactNode, RefObject } from 'react';
+import React, { useCallback, useEffect, useRef } from 'react';
 
 const useEscapeKey = (onDismiss: (() => void) | undefined): void => {
 	useEffect(() => {
diff --git a/apps/meteor/client/components/modal/ModalPortal.tsx b/apps/meteor/client/components/modal/ModalPortal.tsx
index bb3cf00dc89..2b2b198462f 100644
--- a/apps/meteor/client/components/modal/ModalPortal.tsx
+++ b/apps/meteor/client/components/modal/ModalPortal.tsx
@@ -1,4 +1,5 @@
-import { memo, useEffect, ReactElement, ReactNode, useState } from 'react';
+import type { ReactElement, ReactNode } from 'react';
+import { memo, useEffect, useState } from 'react';
 import { createPortal } from 'react-dom';
 
 import { createAnchor } from '../../lib/utils/createAnchor';
diff --git a/apps/meteor/client/components/root/ErrorBoundary.tsx b/apps/meteor/client/components/root/ErrorBoundary.tsx
index d850b32c8b6..9ef5fbfddd1 100644
--- a/apps/meteor/client/components/root/ErrorBoundary.tsx
+++ b/apps/meteor/client/components/root/ErrorBoundary.tsx
@@ -1,6 +1,7 @@
 import Bugsnag from '@bugsnag/js';
 import BugsnagPluginReact from '@bugsnag/plugin-react';
-import React, { Fragment, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { Fragment } from 'react';
 
 import pkg from '../../../package.json';
 
diff --git a/apps/meteor/client/components/voip/room/VoipRoomForeword.tsx b/apps/meteor/client/components/voip/room/VoipRoomForeword.tsx
index 95ce0955cc1..2f0908959eb 100644
--- a/apps/meteor/client/components/voip/room/VoipRoomForeword.tsx
+++ b/apps/meteor/client/components/voip/room/VoipRoomForeword.tsx
@@ -1,7 +1,8 @@
 import type { IVoipRoom } from '@rocket.chat/core-typings';
 import { Avatar, Box, Tag } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { getUserAvatarURL } from '../../../../app/utils/client';
 import { parseOutboundPhoneNumber } from '../../../../ee/client/lib/voip/parseOutboundPhoneNumber';
diff --git a/apps/meteor/client/components/withDoNotAskAgain.tsx b/apps/meteor/client/components/withDoNotAskAgain.tsx
index ee33d6ef8f0..1216cb8d456 100644
--- a/apps/meteor/client/components/withDoNotAskAgain.tsx
+++ b/apps/meteor/client/components/withDoNotAskAgain.tsx
@@ -1,8 +1,9 @@
 import { Box, CheckBox } from '@rocket.chat/fuselage';
 import { useUserPreference, useTranslation, useEndpoint } from '@rocket.chat/ui-contexts';
-import React, { useState, FC, ReactElement, ComponentType } from 'react';
+import type { FC, ReactElement, ComponentType } from 'react';
+import React, { useState } from 'react';
 
-import { DontAskAgainList } from '../hooks/useDontAskAgain';
+import type { DontAskAgainList } from '../hooks/useDontAskAgain';
 
 type DoNotAskAgainProps = {
 	onConfirm: (...args: any) => any;
diff --git a/apps/meteor/client/contexts/CallContext.ts b/apps/meteor/client/contexts/CallContext.ts
index b6899b46c88..89e44b0c4ba 100644
--- a/apps/meteor/client/contexts/CallContext.ts
+++ b/apps/meteor/client/contexts/CallContext.ts
@@ -1,11 +1,10 @@
-import type { IVoipRoom } from '@rocket.chat/core-typings';
-import { ICallerInfo, VoIpCallerInfo } from '@rocket.chat/core-typings';
-import { Device } from '@rocket.chat/ui-contexts';
+import type { IVoipRoom, ICallerInfo, VoIpCallerInfo } from '@rocket.chat/core-typings';
+import type { Device } from '@rocket.chat/ui-contexts';
 import { createContext, useContext, useMemo } from 'react';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
 
 import { useHasLicenseModule } from '../../ee/client/hooks/useHasLicenseModule';
-import { VoIPUser } from '../lib/voip/VoIPUser';
+import type { VoIPUser } from '../lib/voip/VoIPUser';
 
 export type CallContextValue = CallContextDisabled | CallContextReady | CallContextError | CallContextEnabled;
 
diff --git a/apps/meteor/client/contexts/VideoConfContext.ts b/apps/meteor/client/contexts/VideoConfContext.ts
index 3f71fc7b05f..7caacbeac7e 100644
--- a/apps/meteor/client/contexts/VideoConfContext.ts
+++ b/apps/meteor/client/contexts/VideoConfContext.ts
@@ -1,8 +1,9 @@
-import { IRoom } from '@rocket.chat/core-typings';
+import type { IRoom } from '@rocket.chat/core-typings';
 import { createContext, useContext } from 'react';
-import { Subscription, useSubscription } from 'use-subscription';
+import type { Subscription } from 'use-subscription';
+import { useSubscription } from 'use-subscription';
 
-import { DirectCallParams, ProviderCapabilities, CallPreferences } from '../lib/VideoConfManager';
+import type { DirectCallParams, ProviderCapabilities, CallPreferences } from '../lib/VideoConfManager';
 
 export type VideoConfPopupPayload = {
 	id: string;
diff --git a/apps/meteor/client/definitions/SubscriptionWithRoom.ts b/apps/meteor/client/definitions/SubscriptionWithRoom.ts
index 53a69f63b0d..6e47455f98a 100644
--- a/apps/meteor/client/definitions/SubscriptionWithRoom.ts
+++ b/apps/meteor/client/definitions/SubscriptionWithRoom.ts
@@ -1,4 +1,4 @@
-import { IOmnichannelRoom, IRoom, IRoomWithRetentionPolicy, ISubscription } from '@rocket.chat/core-typings';
+import type { IOmnichannelRoom, IRoom, IRoomWithRetentionPolicy, ISubscription } from '@rocket.chat/core-typings';
 
 export type SubscriptionWithRoom = ISubscription &
 	Pick<
diff --git a/apps/meteor/client/hooks/lists/useRecordList.ts b/apps/meteor/client/hooks/lists/useRecordList.ts
index 4c6abf38f6f..0c73223137c 100644
--- a/apps/meteor/client/hooks/lists/useRecordList.ts
+++ b/apps/meteor/client/hooks/lists/useRecordList.ts
@@ -1,8 +1,8 @@
 import type { IRocketChatRecord } from '@rocket.chat/core-typings';
 import { useEffect, useState } from 'react';
 
-import { AsyncStatePhase } from '../../lib/asyncState';
-import { RecordList } from '../../lib/lists/RecordList';
+import type { AsyncStatePhase } from '../../lib/asyncState';
+import type { RecordList } from '../../lib/lists/RecordList';
 
 type RecordListValue<T> = {
 	phase: AsyncStatePhase;
diff --git a/apps/meteor/client/hooks/lists/useScrollableMessageList.ts b/apps/meteor/client/hooks/lists/useScrollableMessageList.ts
index d4663c207f4..d78b13c3030 100644
--- a/apps/meteor/client/hooks/lists/useScrollableMessageList.ts
+++ b/apps/meteor/client/hooks/lists/useScrollableMessageList.ts
@@ -1,9 +1,8 @@
-import type { IMessage } from '@rocket.chat/core-typings';
-import { Serialized } from '@rocket.chat/core-typings';
+import type { IMessage, Serialized } from '@rocket.chat/core-typings';
 import { useCallback } from 'react';
 
-import { MessageList } from '../../lib/lists/MessageList';
-import { RecordListBatchChanges } from '../../lib/lists/RecordList';
+import type { MessageList } from '../../lib/lists/MessageList';
+import type { RecordListBatchChanges } from '../../lib/lists/RecordList';
 import { mapMessageFromApi } from '../../lib/utils/mapMessageFromApi';
 import { useScrollableRecordList } from './useScrollableRecordList';
 
diff --git a/apps/meteor/client/hooks/lists/useScrollableRecordList.ts b/apps/meteor/client/hooks/lists/useScrollableRecordList.ts
index 0fd10f4528e..745b12e16b5 100644
--- a/apps/meteor/client/hooks/lists/useScrollableRecordList.ts
+++ b/apps/meteor/client/hooks/lists/useScrollableRecordList.ts
@@ -2,7 +2,7 @@ import type { IRocketChatRecord } from '@rocket.chat/core-typings';
 import { useCallback, useEffect } from 'react';
 
 import { AsyncStatePhase } from '../../lib/asyncState';
-import { RecordList, RecordListBatchChanges } from '../../lib/lists/RecordList';
+import type { RecordList, RecordListBatchChanges } from '../../lib/lists/RecordList';
 
 const INITIAL_ITEM_COUNT = 25;
 
diff --git a/apps/meteor/client/hooks/lists/useStreamUpdatesForMessageList.ts b/apps/meteor/client/hooks/lists/useStreamUpdatesForMessageList.ts
index 8bdc30fc9d0..44e0aa6f517 100644
--- a/apps/meteor/client/hooks/lists/useStreamUpdatesForMessageList.ts
+++ b/apps/meteor/client/hooks/lists/useStreamUpdatesForMessageList.ts
@@ -2,8 +2,9 @@ import type { IMessage, IRoom, IUser } from '@rocket.chat/core-typings';
 import { useStream } from '@rocket.chat/ui-contexts';
 import { useEffect } from 'react';
 
-import { MessageList } from '../../lib/lists/MessageList';
-import { createFilterFromQuery, FieldExpression, Query } from '../../lib/minimongo';
+import type { MessageList } from '../../lib/lists/MessageList';
+import type { FieldExpression, Query } from '../../lib/minimongo';
+import { createFilterFromQuery } from '../../lib/minimongo';
 
 type RoomMessagesRidEvent = IMessage;
 
diff --git a/apps/meteor/client/hooks/omnichannel/useOmnichannel.ts b/apps/meteor/client/hooks/omnichannel/useOmnichannel.ts
index 140df083dab..c3885303422 100644
--- a/apps/meteor/client/hooks/omnichannel/useOmnichannel.ts
+++ b/apps/meteor/client/hooks/omnichannel/useOmnichannel.ts
@@ -1,5 +1,6 @@
 import { useContext } from 'react';
 
-import { OmnichannelContext, OmnichannelContextValue } from '../../contexts/OmnichannelContext';
+import type { OmnichannelContextValue } from '../../contexts/OmnichannelContext';
+import { OmnichannelContext } from '../../contexts/OmnichannelContext';
 
 export const useOmnichannel = (): OmnichannelContextValue => useContext(OmnichannelContext);
diff --git a/apps/meteor/client/hooks/useClipboardWithToast.ts b/apps/meteor/client/hooks/useClipboardWithToast.ts
index 757dc274e0b..ddabbcf9cf0 100644
--- a/apps/meteor/client/hooks/useClipboardWithToast.ts
+++ b/apps/meteor/client/hooks/useClipboardWithToast.ts
@@ -1,4 +1,5 @@
-import { useClipboard, UseClipboardReturn, useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import type { UseClipboardReturn } from '@rocket.chat/fuselage-hooks';
+import { useClipboard, useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
 
 export default function useClipboardWithToast(text: string): UseClipboardReturn {
diff --git a/apps/meteor/client/hooks/useDecryptedMessage.ts b/apps/meteor/client/hooks/useDecryptedMessage.ts
index 7c13077787d..ea3cf3cc62a 100644
--- a/apps/meteor/client/hooks/useDecryptedMessage.ts
+++ b/apps/meteor/client/hooks/useDecryptedMessage.ts
@@ -1,4 +1,5 @@
-import { IMessage, isE2EEMessage } from '@rocket.chat/core-typings';
+import type { IMessage } from '@rocket.chat/core-typings';
+import { isE2EEMessage } from '@rocket.chat/core-typings';
 import { useSafely } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import { useState, useEffect } from 'react';
diff --git a/apps/meteor/client/hooks/useEndpointAction.ts b/apps/meteor/client/hooks/useEndpointAction.ts
index 8b8d9a960d7..c45659214e1 100644
--- a/apps/meteor/client/hooks/useEndpointAction.ts
+++ b/apps/meteor/client/hooks/useEndpointAction.ts
@@ -1,4 +1,4 @@
-import { Serialized } from '@rocket.chat/core-typings';
+import type { Serialized } from '@rocket.chat/core-typings';
 import type { MatchPathPattern, Method, OperationParams, OperationResult, PathFor } from '@rocket.chat/rest-typings';
 import { useToastMessageDispatch, useEndpoint } from '@rocket.chat/ui-contexts';
 import { useCallback } from 'react';
diff --git a/apps/meteor/client/hooks/useEndpointActionExperimental.ts b/apps/meteor/client/hooks/useEndpointActionExperimental.ts
index a153c57b2c7..352d9f312d4 100644
--- a/apps/meteor/client/hooks/useEndpointActionExperimental.ts
+++ b/apps/meteor/client/hooks/useEndpointActionExperimental.ts
@@ -1,4 +1,4 @@
-import { Serialized } from '@rocket.chat/core-typings';
+import type { Serialized } from '@rocket.chat/core-typings';
 import type { MatchPathPattern, Method, OperationParams, OperationResult, PathFor } from '@rocket.chat/rest-typings';
 import { useToastMessageDispatch, useEndpoint } from '@rocket.chat/ui-contexts';
 import { useCallback } from 'react';
diff --git a/apps/meteor/client/hooks/useEndpointData.ts b/apps/meteor/client/hooks/useEndpointData.ts
index 498d58819e2..d3fe845a3c8 100644
--- a/apps/meteor/client/hooks/useEndpointData.ts
+++ b/apps/meteor/client/hooks/useEndpointData.ts
@@ -1,10 +1,11 @@
-import { Serialized } from '@rocket.chat/core-typings';
+import type { Serialized } from '@rocket.chat/core-typings';
 import type { MatchPathPattern, OperationParams, OperationResult, PathFor } from '@rocket.chat/rest-typings';
 import { useToastMessageDispatch, useEndpoint } from '@rocket.chat/ui-contexts';
 import { useCallback, useEffect } from 'react';
 
 import { getConfig } from '../lib/utils/getConfig';
-import { AsyncState, useAsyncState } from './useAsyncState';
+import type { AsyncState } from './useAsyncState';
+import { useAsyncState } from './useAsyncState';
 
 const log = (name: string): Console['log'] =>
 	process.env.NODE_ENV !== 'production' || getConfig('debug') === 'true'
diff --git a/apps/meteor/client/hooks/useEndpointUpload.ts b/apps/meteor/client/hooks/useEndpointUpload.ts
index 0028cb3a8dc..aafbbc1709a 100644
--- a/apps/meteor/client/hooks/useEndpointUpload.ts
+++ b/apps/meteor/client/hooks/useEndpointUpload.ts
@@ -1,4 +1,5 @@
-import { useToastMessageDispatch, UploadResult, useUpload } from '@rocket.chat/ui-contexts';
+import type { UploadResult } from '@rocket.chat/ui-contexts';
+import { useToastMessageDispatch, useUpload } from '@rocket.chat/ui-contexts';
 import { useCallback } from 'react';
 
 export const useEndpointUpload = (
diff --git a/apps/meteor/client/hooks/useForm.ts b/apps/meteor/client/hooks/useForm.ts
index 9e22dc921ab..d84aca63fc0 100644
--- a/apps/meteor/client/hooks/useForm.ts
+++ b/apps/meteor/client/hooks/useForm.ts
@@ -1,5 +1,6 @@
 import { capitalize } from '@rocket.chat/string-helpers';
-import { useCallback, useReducer, useMemo, ChangeEvent } from 'react';
+import type { ChangeEvent } from 'react';
+import { useCallback, useReducer, useMemo } from 'react';
 
 type Field = {
 	name: string;
diff --git a/apps/meteor/client/hooks/useFormatDateAndTime.ts b/apps/meteor/client/hooks/useFormatDateAndTime.ts
index 8028a9ac304..2fd8ad81e6a 100644
--- a/apps/meteor/client/hooks/useFormatDateAndTime.ts
+++ b/apps/meteor/client/hooks/useFormatDateAndTime.ts
@@ -1,5 +1,6 @@
 import { useUserPreference, useSetting } from '@rocket.chat/ui-contexts';
-import moment, { MomentInput } from 'moment';
+import type { MomentInput } from 'moment';
+import moment from 'moment';
 import { useCallback } from 'react';
 
 type UseFormatDateAndTimeParams = {
diff --git a/apps/meteor/client/hooks/useIsEnterprise.ts b/apps/meteor/client/hooks/useIsEnterprise.ts
index 532624848c9..a51672ad17e 100644
--- a/apps/meteor/client/hooks/useIsEnterprise.ts
+++ b/apps/meteor/client/hooks/useIsEnterprise.ts
@@ -1,6 +1,7 @@
-import { OperationResult } from '@rocket.chat/rest-typings';
+import type { OperationResult } from '@rocket.chat/rest-typings';
 import { useEndpoint } from '@rocket.chat/ui-contexts';
-import { useQuery, UseQueryResult } from '@tanstack/react-query';
+import type { UseQueryResult } from '@tanstack/react-query';
+import { useQuery } from '@tanstack/react-query';
 
 export const useIsEnterprise = (): UseQueryResult<OperationResult<'GET', '/v1/licenses.isEnterprise'>> => {
 	const isEnterpriseEdition = useEndpoint('GET', '/v1/licenses.isEnterprise');
diff --git a/apps/meteor/client/hooks/useLicense.ts b/apps/meteor/client/hooks/useLicense.ts
index 27fc49fcefa..eb8f22ac4f7 100644
--- a/apps/meteor/client/hooks/useLicense.ts
+++ b/apps/meteor/client/hooks/useLicense.ts
@@ -1,6 +1,7 @@
-import { OperationResult } from '@rocket.chat/rest-typings';
+import type { OperationResult } from '@rocket.chat/rest-typings';
 import { useEndpoint } from '@rocket.chat/ui-contexts';
-import { useQuery, UseQueryResult } from '@tanstack/react-query';
+import type { UseQueryResult } from '@tanstack/react-query';
+import { useQuery } from '@tanstack/react-query';
 
 export const useLicense = (): UseQueryResult<OperationResult<'GET', '/v1/licenses.get'>> => {
 	const getLicenses = useEndpoint('GET', '/v1/licenses.get');
diff --git a/apps/meteor/client/hooks/usePresence.ts b/apps/meteor/client/hooks/usePresence.ts
index 488ae58cab8..ae152023d88 100644
--- a/apps/meteor/client/hooks/usePresence.ts
+++ b/apps/meteor/client/hooks/usePresence.ts
@@ -1,9 +1,8 @@
 import { useCallback } from 'react';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
 
-import { Presence, UserPresence } from '../lib/presence';
-
-type Presence = 'online' | 'offline' | 'busy' | 'away' | 'loading';
+import type { UserPresence } from '../lib/presence';
+import { Presence } from '../lib/presence';
 
 /**
  * Hook to fetch and subscribe users presence
diff --git a/apps/meteor/client/hooks/usePreventPropagation.ts b/apps/meteor/client/hooks/usePreventPropagation.ts
index d14b10dbf39..a444fae2856 100644
--- a/apps/meteor/client/hooks/usePreventPropagation.ts
+++ b/apps/meteor/client/hooks/usePreventPropagation.ts
@@ -1,5 +1,5 @@
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { MouseEvent } from 'react';
+import type { MouseEvent } from 'react';
 
 export const usePreventPropagation = (fn?: (e: MouseEvent) => void): ((e: MouseEvent) => void) => {
 	const preventClickPropagation = useMutableCallback((e): void => {
diff --git a/apps/meteor/client/hooks/useReactiveQuery.ts b/apps/meteor/client/hooks/useReactiveQuery.ts
index b7c6d2061d5..6f391917cee 100644
--- a/apps/meteor/client/hooks/useReactiveQuery.ts
+++ b/apps/meteor/client/hooks/useReactiveQuery.ts
@@ -1,5 +1,6 @@
-import { IRole, IRoom, ISubscription, IUser } from '@rocket.chat/core-typings';
-import { useQuery, UseQueryOptions, QueryKey, UseQueryResult, useQueryClient } from '@tanstack/react-query';
+import type { IRole, IRoom, ISubscription, IUser } from '@rocket.chat/core-typings';
+import type { UseQueryOptions, QueryKey, UseQueryResult } from '@tanstack/react-query';
+import { useQuery, useQueryClient } from '@tanstack/react-query';
 import { Tracker } from 'meteor/tracker';
 
 import { Roles, RoomRoles, Rooms, Subscriptions, Users } from '../../app/models/client';
diff --git a/apps/meteor/client/hooks/useReactiveVar.ts b/apps/meteor/client/hooks/useReactiveVar.ts
index d31581ca254..d6853b77942 100644
--- a/apps/meteor/client/hooks/useReactiveVar.ts
+++ b/apps/meteor/client/hooks/useReactiveVar.ts
@@ -1,4 +1,4 @@
-import { ReactiveVar } from 'meteor/reactive-var';
+import type { ReactiveVar } from 'meteor/reactive-var';
 import { useCallback } from 'react';
 
 import { useReactiveValue } from './useReactiveValue';
diff --git a/apps/meteor/client/hooks/useRegistrationStatus.ts b/apps/meteor/client/hooks/useRegistrationStatus.ts
index 8bd783714d8..71db4981576 100644
--- a/apps/meteor/client/hooks/useRegistrationStatus.ts
+++ b/apps/meteor/client/hooks/useRegistrationStatus.ts
@@ -1,6 +1,7 @@
-import { OperationResult } from '@rocket.chat/rest-typings';
+import type { OperationResult } from '@rocket.chat/rest-typings';
 import { useEndpoint } from '@rocket.chat/ui-contexts';
-import { useQuery, UseQueryResult } from '@tanstack/react-query';
+import type { UseQueryResult } from '@tanstack/react-query';
+import { useQuery } from '@tanstack/react-query';
 
 export const useRegistrationStatus = (): UseQueryResult<OperationResult<'GET', '/v1/cloud.registrationStatus'>> => {
 	const getRegistrationStatus = useEndpoint('GET', '/v1/cloud.registrationStatus');
diff --git a/apps/meteor/client/hooks/useRoomIcon.tsx b/apps/meteor/client/hooks/useRoomIcon.tsx
index a1e3c22f62f..5a068392843 100644
--- a/apps/meteor/client/hooks/useRoomIcon.tsx
+++ b/apps/meteor/client/hooks/useRoomIcon.tsx
@@ -1,7 +1,8 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { isRoomFederated, isDirectMessageRoom } from '@rocket.chat/core-typings';
-import { Icon } from '@rocket.chat/fuselage';
-import React, { ComponentProps, ReactElement } from 'react';
+import type { Icon } from '@rocket.chat/fuselage';
+import type { ComponentProps, ReactElement } from 'react';
+import React from 'react';
 
 import { ReactiveUserStatus } from '../components/UserStatus';
 
diff --git a/apps/meteor/client/hooks/useRoomInfoEndpoint.ts b/apps/meteor/client/hooks/useRoomInfoEndpoint.ts
index 6a97a251f89..169101e29c8 100644
--- a/apps/meteor/client/hooks/useRoomInfoEndpoint.ts
+++ b/apps/meteor/client/hooks/useRoomInfoEndpoint.ts
@@ -1,7 +1,8 @@
-import { IRoom } from '@rocket.chat/core-typings';
-import { OperationResult } from '@rocket.chat/rest-typings';
+import type { IRoom } from '@rocket.chat/core-typings';
+import type { OperationResult } from '@rocket.chat/rest-typings';
 import { useEndpoint } from '@rocket.chat/ui-contexts';
-import { useQuery, UseQueryResult } from '@tanstack/react-query';
+import type { UseQueryResult } from '@tanstack/react-query';
+import { useQuery } from '@tanstack/react-query';
 import { minutesToMilliseconds } from 'date-fns';
 import type { Meteor } from 'meteor/meteor';
 
diff --git a/apps/meteor/client/hooks/useUpdateAvatar.ts b/apps/meteor/client/hooks/useUpdateAvatar.ts
index fcf255803df..851a815d685 100644
--- a/apps/meteor/client/hooks/useUpdateAvatar.ts
+++ b/apps/meteor/client/hooks/useUpdateAvatar.ts
@@ -1,4 +1,4 @@
-import { AvatarObject, AvatarServiceObject, AvatarReset, AvatarUrlObj, IUser } from '@rocket.chat/core-typings';
+import type { AvatarObject, AvatarServiceObject, AvatarReset, AvatarUrlObj, IUser } from '@rocket.chat/core-typings';
 import { useToastMessageDispatch, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
 import { useMemo, useCallback } from 'react';
 
diff --git a/apps/meteor/client/hooks/useUserData.ts b/apps/meteor/client/hooks/useUserData.ts
index 4621cf89512..bd2f456cff5 100644
--- a/apps/meteor/client/hooks/useUserData.ts
+++ b/apps/meteor/client/hooks/useUserData.ts
@@ -1,7 +1,8 @@
 import { useCallback } from 'react';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
 
-import { UserPresence, Presence } from '../lib/presence';
+import type { UserPresence } from '../lib/presence';
+import { Presence } from '../lib/presence';
 
 /**
  * Hook to fetch and subscribe users data
diff --git a/apps/meteor/client/lib/RoomManager.ts b/apps/meteor/client/lib/RoomManager.ts
index f05bde279d4..728c119bce8 100644
--- a/apps/meteor/client/lib/RoomManager.ts
+++ b/apps/meteor/client/lib/RoomManager.ts
@@ -6,7 +6,7 @@ import { useSyncExternalStore } from 'use-sync-external-store/shim';
 
 import { RoomHistoryManager } from '../../app/ui-utils/client/lib/RoomHistoryManager';
 import { useAsyncState } from '../hooks/useAsyncState';
-import { AsyncState } from './asyncState';
+import type { AsyncState } from './asyncState';
 import { getConfig } from './utils/getConfig';
 
 const debug = !!(getConfig('debug') || getConfig('debug-RoomStore'));
diff --git a/apps/meteor/client/lib/appLayout.ts b/apps/meteor/client/lib/appLayout.ts
index a8a8be72540..7996e79430d 100644
--- a/apps/meteor/client/lib/appLayout.ts
+++ b/apps/meteor/client/lib/appLayout.ts
@@ -1,5 +1,5 @@
 import { Emitter } from '@rocket.chat/emitter';
-import { ReactElement } from 'react';
+import type { ReactElement } from 'react';
 
 type AppLayoutDescriptor = ReactElement | null;
 
diff --git a/apps/meteor/client/lib/asyncState/AsyncState.ts b/apps/meteor/client/lib/asyncState/AsyncState.ts
index a53d21df877..827c1048c32 100644
--- a/apps/meteor/client/lib/asyncState/AsyncState.ts
+++ b/apps/meteor/client/lib/asyncState/AsyncState.ts
@@ -1,4 +1,4 @@
-import { AsyncStatePhase } from './AsyncStatePhase';
+import type { AsyncStatePhase } from './AsyncStatePhase';
 
 export type AsyncState<T> =
 	| { phase: AsyncStatePhase.LOADING; value: undefined; error: undefined }
diff --git a/apps/meteor/client/lib/asyncState/functions.ts b/apps/meteor/client/lib/asyncState/functions.ts
index f34d0fc5472..3c2ab0feeac 100644
--- a/apps/meteor/client/lib/asyncState/functions.ts
+++ b/apps/meteor/client/lib/asyncState/functions.ts
@@ -1,4 +1,4 @@
-import { AsyncState } from './AsyncState';
+import type { AsyncState } from './AsyncState';
 import { AsyncStatePhase } from './AsyncStatePhase';
 
 export const loading = <T>(): AsyncState<T> => ({
diff --git a/apps/meteor/client/lib/banners.ts b/apps/meteor/client/lib/banners.ts
index 02df87e95ec..c442484809c 100644
--- a/apps/meteor/client/lib/banners.ts
+++ b/apps/meteor/client/lib/banners.ts
@@ -1,7 +1,7 @@
-import { UiKitBannerPayload } from '@rocket.chat/core-typings';
+import type { UiKitBannerPayload } from '@rocket.chat/core-typings';
 import { Emitter } from '@rocket.chat/emitter';
-import { Icon } from '@rocket.chat/fuselage';
-import { ComponentProps } from 'react';
+import type { Icon } from '@rocket.chat/fuselage';
+import type { ComponentProps } from 'react';
 
 export type LegacyBannerPayload = {
 	id: string;
diff --git a/apps/meteor/client/lib/chats/ChatAPI.ts b/apps/meteor/client/lib/chats/ChatAPI.ts
index 1957c58df6e..970e2a58d2d 100644
--- a/apps/meteor/client/lib/chats/ChatAPI.ts
+++ b/apps/meteor/client/lib/chats/ChatAPI.ts
@@ -1,6 +1,6 @@
-import { IMessage, IRoom } from '@rocket.chat/core-typings';
+import type { IMessage, IRoom } from '@rocket.chat/core-typings';
 
-import { Upload } from './Upload';
+import type { Upload } from './Upload';
 
 export type ComposerAPI = {
 	release(): void;
diff --git a/apps/meteor/client/lib/chats/data.ts b/apps/meteor/client/lib/chats/data.ts
index 17db7b7ac18..f2cfa17528d 100644
--- a/apps/meteor/client/lib/chats/data.ts
+++ b/apps/meteor/client/lib/chats/data.ts
@@ -10,7 +10,7 @@ import { getRandomId } from '../../../lib/random';
 import { onClientBeforeSendMessage } from '../onClientBeforeSendMessage';
 import { call } from '../utils/call';
 import { prependReplies } from '../utils/prependReplies';
-import { DataAPI } from './ChatAPI';
+import type { DataAPI } from './ChatAPI';
 
 const messagesCollection = Messages as Mongo.Collection<IMessage>;
 const roomsCollection = Rooms as Mongo.Collection<IRoom>;
diff --git a/apps/meteor/client/lib/chats/flows/processMessageEditing.ts b/apps/meteor/client/lib/chats/flows/processMessageEditing.ts
index a72f953d871..82a0c4a48c6 100644
--- a/apps/meteor/client/lib/chats/flows/processMessageEditing.ts
+++ b/apps/meteor/client/lib/chats/flows/processMessageEditing.ts
@@ -1,8 +1,8 @@
-import { IMessage } from '@rocket.chat/core-typings';
+import type { IMessage } from '@rocket.chat/core-typings';
 
 import { MessageTypes } from '../../../../app/ui-utils/client';
 import { dispatchToastMessage } from '../../toast';
-import { ChatAPI } from '../ChatAPI';
+import type { ChatAPI } from '../ChatAPI';
 
 export const processMessageEditing = async (
 	chat: ChatAPI,
diff --git a/apps/meteor/client/lib/chats/flows/processSetReaction.ts b/apps/meteor/client/lib/chats/flows/processSetReaction.ts
index 2782465f45c..17288696076 100644
--- a/apps/meteor/client/lib/chats/flows/processSetReaction.ts
+++ b/apps/meteor/client/lib/chats/flows/processSetReaction.ts
@@ -1,8 +1,8 @@
-import { IMessage } from '@rocket.chat/core-typings';
+import type { IMessage } from '@rocket.chat/core-typings';
 
 import { emoji } from '../../../../app/emoji/client';
 import { callWithErrorHandling } from '../../utils/callWithErrorHandling';
-import { ChatAPI } from '../ChatAPI';
+import type { ChatAPI } from '../ChatAPI';
 
 export const processSetReaction = async (chat: ChatAPI, { msg }: Pick<IMessage, 'msg'>): Promise<boolean> => {
 	const match = msg.trim().match(/^\+(:.*?:)$/m);
diff --git a/apps/meteor/client/lib/chats/flows/processTooLongMessage.ts b/apps/meteor/client/lib/chats/flows/processTooLongMessage.ts
index 21f81bae7aa..e062d0b2e12 100644
--- a/apps/meteor/client/lib/chats/flows/processTooLongMessage.ts
+++ b/apps/meteor/client/lib/chats/flows/processTooLongMessage.ts
@@ -1,4 +1,4 @@
-import { IMessage } from '@rocket.chat/core-typings';
+import type { IMessage } from '@rocket.chat/core-typings';
 
 import { settings } from '../../../../app/settings/client';
 import { messageProperties } from '../../../../app/ui-utils/client';
@@ -6,7 +6,7 @@ import { t } from '../../../../app/utils/client';
 import GenericModal from '../../../components/GenericModal';
 import { imperativeModal } from '../../imperativeModal';
 import { dispatchToastMessage } from '../../toast';
-import { ChatAPI } from '../ChatAPI';
+import type { ChatAPI } from '../ChatAPI';
 
 export const processTooLongMessage = async (chat: ChatAPI, { msg }: Pick<IMessage, 'msg'>): Promise<boolean> => {
 	const adjustedMessage = messageProperties.messageWithoutEmojiShortnames(msg);
diff --git a/apps/meteor/client/lib/chats/flows/requestMessageDeletion.ts b/apps/meteor/client/lib/chats/flows/requestMessageDeletion.ts
index a04e7713368..a91496f9661 100644
--- a/apps/meteor/client/lib/chats/flows/requestMessageDeletion.ts
+++ b/apps/meteor/client/lib/chats/flows/requestMessageDeletion.ts
@@ -1,10 +1,10 @@
-import { IMessage } from '@rocket.chat/core-typings';
+import type { IMessage } from '@rocket.chat/core-typings';
 
 import { t } from '../../../../app/utils/client';
 import GenericModal from '../../../components/GenericModal';
 import { imperativeModal } from '../../imperativeModal';
 import { dispatchToastMessage } from '../../toast';
-import { ChatAPI } from '../ChatAPI';
+import type { ChatAPI } from '../ChatAPI';
 
 export const requestMessageDeletion = async (chat: ChatAPI, message: IMessage): Promise<void> => {
 	if (!(await chat.data.canDeleteMessage(message))) {
diff --git a/apps/meteor/client/lib/chats/flows/sendMessage.ts b/apps/meteor/client/lib/chats/flows/sendMessage.ts
index e129e22f388..9320e7fcf05 100644
--- a/apps/meteor/client/lib/chats/flows/sendMessage.ts
+++ b/apps/meteor/client/lib/chats/flows/sendMessage.ts
@@ -1,10 +1,10 @@
-import { IMessage } from '@rocket.chat/core-typings';
+import type { IMessage } from '@rocket.chat/core-typings';
 
 import { KonchatNotification } from '../../../../app/ui/client';
 import { t } from '../../../../app/utils/client';
 import { dispatchToastMessage } from '../../toast';
 import { call } from '../../utils/call';
-import { ChatAPI } from '../ChatAPI';
+import type { ChatAPI } from '../ChatAPI';
 import { processMessageEditing } from './processMessageEditing';
 import { processSetReaction } from './processSetReaction';
 import { processSlashCommand } from './processSlashCommand';
diff --git a/apps/meteor/client/lib/chats/flows/uploadFiles.ts b/apps/meteor/client/lib/chats/flows/uploadFiles.ts
index 78f7019218f..58eb18400a3 100644
--- a/apps/meteor/client/lib/chats/flows/uploadFiles.ts
+++ b/apps/meteor/client/lib/chats/flows/uploadFiles.ts
@@ -4,7 +4,7 @@ import { fileUploadIsValidContentType } from '../../../../app/utils/client';
 import FileUploadModal from '../../../views/room/modals/FileUploadModal';
 import { imperativeModal } from '../../imperativeModal';
 import { prependReplies } from '../../utils/prependReplies';
-import { ChatAPI } from '../ChatAPI';
+import type { ChatAPI } from '../ChatAPI';
 
 export const uploadFiles = async (chat: ChatAPI, files: readonly File[]): Promise<void> => {
 	const replies = chat.composer?.quotedMessages.get() ?? [];
diff --git a/apps/meteor/client/lib/chats/uploads.ts b/apps/meteor/client/lib/chats/uploads.ts
index 83469a1039e..55ef9ca70f1 100644
--- a/apps/meteor/client/lib/chats/uploads.ts
+++ b/apps/meteor/client/lib/chats/uploads.ts
@@ -1,11 +1,11 @@
-import { IMessage, IRoom } from '@rocket.chat/core-typings';
+import type { IMessage, IRoom } from '@rocket.chat/core-typings';
 import { Emitter } from '@rocket.chat/emitter';
 
 import { UserAction, USER_ACTIVITIES } from '../../../app/ui/client/lib/UserAction';
 import { APIClient } from '../../../app/utils/client';
 import { getRandomId } from '../../../lib/random';
 import { getErrorMessage } from '../errorHandling';
-import { UploadsAPI } from './ChatAPI';
+import type { UploadsAPI } from './ChatAPI';
 import type { Upload } from './Upload';
 
 let uploads: readonly Upload[] = [];
diff --git a/apps/meteor/client/lib/createRouteGroup.tsx b/apps/meteor/client/lib/createRouteGroup.tsx
index 264935af7a4..bb41d7a09b0 100644
--- a/apps/meteor/client/lib/createRouteGroup.tsx
+++ b/apps/meteor/client/lib/createRouteGroup.tsx
@@ -1,7 +1,9 @@
-import { FlowRouter, Group, RouteOptions } from 'meteor/kadira:flow-router';
+import type { Group, RouteOptions } from 'meteor/kadira:flow-router';
+import { FlowRouter } from 'meteor/kadira:flow-router';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Tracker } from 'meteor/tracker';
-import React, { ElementType, ReactNode } from 'react';
+import type { ElementType, ReactNode } from 'react';
+import React from 'react';
 
 import MainLayout from '../views/root/MainLayout';
 import { appLayout } from './appLayout';
diff --git a/apps/meteor/client/lib/createSidebarItems.ts b/apps/meteor/client/lib/createSidebarItems.ts
index b773e733a58..ff7eb08d043 100644
--- a/apps/meteor/client/lib/createSidebarItems.ts
+++ b/apps/meteor/client/lib/createSidebarItems.ts
@@ -1,4 +1,4 @@
-import { IconProps } from '@rocket.chat/fuselage';
+import type { IconProps } from '@rocket.chat/fuselage';
 
 export type SidebarItem = {
 	i18nLabel: string;
diff --git a/apps/meteor/client/lib/getWebdavServerName.ts b/apps/meteor/client/lib/getWebdavServerName.ts
index 7126a08f0bc..b7b73ca8bde 100644
--- a/apps/meteor/client/lib/getWebdavServerName.ts
+++ b/apps/meteor/client/lib/getWebdavServerName.ts
@@ -1,4 +1,4 @@
-import { IWebdavAccountIntegration } from '@rocket.chat/core-typings';
+import type { IWebdavAccountIntegration } from '@rocket.chat/core-typings';
 
 export const getWebdavServerName = ({ name, serverURL, username }: Omit<IWebdavAccountIntegration, '_id'>): string =>
 	name || `${username}@${serverURL?.replace(/^https?\:\/\//i, '')}`;
diff --git a/apps/meteor/client/lib/imperativeModal.ts b/apps/meteor/client/lib/imperativeModal.ts
index f19eb9b71f0..b248da919dc 100644
--- a/apps/meteor/client/lib/imperativeModal.ts
+++ b/apps/meteor/client/lib/imperativeModal.ts
@@ -1,5 +1,5 @@
 import { Emitter } from '@rocket.chat/emitter';
-import { ComponentType } from 'react';
+import type { ComponentType } from 'react';
 
 type ReactModalDescriptor<TProps> = {
 	component: ComponentType<TProps>;
diff --git a/apps/meteor/client/lib/minimongo/query.ts b/apps/meteor/client/lib/minimongo/query.ts
index 9cfd0b0d0b7..d9a133f3e07 100644
--- a/apps/meteor/client/lib/minimongo/query.ts
+++ b/apps/meteor/client/lib/minimongo/query.ts
@@ -2,7 +2,7 @@
 import { compareBSONValues, getBSONType } from './bson';
 import { equals, flatSome, isObject, some } from './comparisons';
 import { createLookupFunction } from './lookups';
-import { BSONType, FieldExpression, Query } from './types';
+import type { BSONType, FieldExpression, Query } from './types';
 
 const isArrayOfFields = <T>(values: unknown[]): values is T[] =>
 	values.every((value) => ['number', 'string', 'symbol'].includes(typeof value));
diff --git a/apps/meteor/client/lib/minimongo/sort.ts b/apps/meteor/client/lib/minimongo/sort.ts
index 5e91afa7047..066a20a193e 100644
--- a/apps/meteor/client/lib/minimongo/sort.ts
+++ b/apps/meteor/client/lib/minimongo/sort.ts
@@ -1,7 +1,7 @@
 import { compareBSONValues } from './bson';
 import { isEmptyArray } from './comparisons';
 import { createLookupFunction } from './lookups';
-import { Sort } from './types';
+import type { Sort } from './types';
 
 const createSortSpecParts = <T>(
 	spec: Sort,
diff --git a/apps/meteor/client/lib/portals/createLazyElement.ts b/apps/meteor/client/lib/portals/createLazyElement.ts
index f5e42c0d014..463dc12a864 100644
--- a/apps/meteor/client/lib/portals/createLazyElement.ts
+++ b/apps/meteor/client/lib/portals/createLazyElement.ts
@@ -1,4 +1,5 @@
-import { ComponentType, ReactElement, PropsWithoutRef, createElement, lazy, Suspense, FC } from 'react';
+import type { ComponentType, ReactElement, PropsWithoutRef, FC } from 'react';
+import { createElement, lazy, Suspense } from 'react';
 
 import { useReactiveValue } from '../../hooks/useReactiveValue';
 
diff --git a/apps/meteor/client/lib/portals/createLazyPortal.ts b/apps/meteor/client/lib/portals/createLazyPortal.ts
index 997ecf1c734..1c41acb7843 100644
--- a/apps/meteor/client/lib/portals/createLazyPortal.ts
+++ b/apps/meteor/client/lib/portals/createLazyPortal.ts
@@ -1,4 +1,4 @@
-import { ComponentType, PropsWithoutRef, ReactPortal } from 'react';
+import type { ComponentType, PropsWithoutRef, ReactPortal } from 'react';
 import { createPortal } from 'react-dom';
 
 import { createLazyElement } from './createLazyElement';
diff --git a/apps/meteor/client/lib/presence.ts b/apps/meteor/client/lib/presence.ts
index 4a14c1478b2..1decf8fe819 100644
--- a/apps/meteor/client/lib/presence.ts
+++ b/apps/meteor/client/lib/presence.ts
@@ -1,6 +1,7 @@
 import type { IUser } from '@rocket.chat/core-typings';
 import { UserStatus } from '@rocket.chat/core-typings';
-import { Emitter, EventHandlerOf } from '@rocket.chat/emitter';
+import type { EventHandlerOf } from '@rocket.chat/emitter';
+import { Emitter } from '@rocket.chat/emitter';
 import { Meteor } from 'meteor/meteor';
 
 import { APIClient } from '../../app/utils/client';
diff --git a/apps/meteor/client/lib/rooms/roomCoordinator.ts b/apps/meteor/client/lib/rooms/roomCoordinator.ts
index 6a44bce3181..131b77b9c1b 100644
--- a/apps/meteor/client/lib/rooms/roomCoordinator.ts
+++ b/apps/meteor/client/lib/rooms/roomCoordinator.ts
@@ -6,8 +6,14 @@ import _ from 'underscore';
 import { hasPermission } from '../../../app/authorization/client';
 import { ChatRoom, ChatSubscription } from '../../../app/models/client';
 import { openRoom } from '../../../app/ui-utils/client/lib/openRoom';
-import { RoomSettingsEnum, RoomMemberActions, UiTextContext } from '../../../definition/IRoomTypeConfig';
-import type { IRoomTypeConfig, IRoomTypeClientDirectives, RoomIdentification } from '../../../definition/IRoomTypeConfig';
+import type {
+	RoomSettingsEnum,
+	RoomMemberActions,
+	UiTextContext,
+	IRoomTypeConfig,
+	IRoomTypeClientDirectives,
+	RoomIdentification,
+} from '../../../definition/IRoomTypeConfig';
 import { RoomCoordinator } from '../../../lib/rooms/coordinator';
 import { roomExit } from './roomExit';
 
diff --git a/apps/meteor/client/lib/rooms/roomTypes/private.ts b/apps/meteor/client/lib/rooms/roomTypes/private.ts
index 6a11ed22aa2..2cc47c2d2af 100644
--- a/apps/meteor/client/lib/rooms/roomTypes/private.ts
+++ b/apps/meteor/client/lib/rooms/roomTypes/private.ts
@@ -1,4 +1,5 @@
-import { AtLeast, IRoom, isRoomFederated } from '@rocket.chat/core-typings';
+import type { AtLeast, IRoom } from '@rocket.chat/core-typings';
+import { isRoomFederated } from '@rocket.chat/core-typings';
 import { Meteor } from 'meteor/meteor';
 
 import { hasPermission } from '../../../../app/authorization/client';
diff --git a/apps/meteor/client/lib/rooms/roomTypes/public.ts b/apps/meteor/client/lib/rooms/roomTypes/public.ts
index 7a38b76e11a..3f5caf4b340 100644
--- a/apps/meteor/client/lib/rooms/roomTypes/public.ts
+++ b/apps/meteor/client/lib/rooms/roomTypes/public.ts
@@ -1,4 +1,5 @@
-import { AtLeast, IRoom, isRoomFederated } from '@rocket.chat/core-typings';
+import type { AtLeast, IRoom } from '@rocket.chat/core-typings';
+import { isRoomFederated } from '@rocket.chat/core-typings';
 import { Meteor } from 'meteor/meteor';
 
 import { hasAtLeastOnePermission } from '../../../../app/authorization/client';
diff --git a/apps/meteor/client/lib/rooms/roomTypes/voip.ts b/apps/meteor/client/lib/rooms/roomTypes/voip.ts
index d09c94bb157..7313f25b18e 100644
--- a/apps/meteor/client/lib/rooms/roomTypes/voip.ts
+++ b/apps/meteor/client/lib/rooms/roomTypes/voip.ts
@@ -4,7 +4,7 @@ import { hasPermission } from '../../../../app/authorization/client';
 import { ChatRoom } from '../../../../app/models/client';
 import { settings } from '../../../../app/settings/client';
 import { getAvatarURL } from '../../../../app/utils/lib/getAvatarURL';
-import { IRoomTypeClientDirectives } from '../../../../definition/IRoomTypeConfig';
+import type { IRoomTypeClientDirectives } from '../../../../definition/IRoomTypeConfig';
 import { getVoipRoomType } from '../../../../lib/rooms/roomTypes/voip';
 import { roomCoordinator } from '../roomCoordinator';
 
diff --git a/apps/meteor/client/lib/userData.ts b/apps/meteor/client/lib/userData.ts
index 85b724fe8fe..76ecb475dbd 100644
--- a/apps/meteor/client/lib/userData.ts
+++ b/apps/meteor/client/lib/userData.ts
@@ -1,5 +1,4 @@
-import type { ILivechatAgent, IUser, IUserDataEvent } from '@rocket.chat/core-typings';
-import { Serialized } from '@rocket.chat/core-typings';
+import type { ILivechatAgent, IUser, IUserDataEvent, Serialized } from '@rocket.chat/core-typings';
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 
diff --git a/apps/meteor/client/lib/utils/call.ts b/apps/meteor/client/lib/utils/call.ts
index 1cf72a66f3e..0fcdd6981f8 100644
--- a/apps/meteor/client/lib/utils/call.ts
+++ b/apps/meteor/client/lib/utils/call.ts
@@ -1,4 +1,4 @@
-import { ServerMethodName, ServerMethodParameters, ServerMethodReturn } from '@rocket.chat/ui-contexts';
+import type { ServerMethodName, ServerMethodParameters, ServerMethodReturn } from '@rocket.chat/ui-contexts';
 import { Meteor } from 'meteor/meteor';
 
 export const call = <M extends ServerMethodName>(method: M, ...params: ServerMethodParameters<M>): Promise<ServerMethodReturn<M>> =>
diff --git a/apps/meteor/client/lib/utils/callWithErrorHandling.ts b/apps/meteor/client/lib/utils/callWithErrorHandling.ts
index e386f2b5106..1ead6d0ee01 100644
--- a/apps/meteor/client/lib/utils/callWithErrorHandling.ts
+++ b/apps/meteor/client/lib/utils/callWithErrorHandling.ts
@@ -1,4 +1,4 @@
-import { ServerMethodName, ServerMethodParameters, ServerMethodReturn } from '@rocket.chat/ui-contexts';
+import type { ServerMethodName, ServerMethodParameters, ServerMethodReturn } from '@rocket.chat/ui-contexts';
 
 import { dispatchToastMessage } from '../toast';
 import { call } from './call';
diff --git a/apps/meteor/client/lib/utils/canDeleteMessage.ts b/apps/meteor/client/lib/utils/canDeleteMessage.ts
index 93e84d9d5ad..9f1ef22de1a 100644
--- a/apps/meteor/client/lib/utils/canDeleteMessage.ts
+++ b/apps/meteor/client/lib/utils/canDeleteMessage.ts
@@ -1,6 +1,7 @@
 import type { IRoom, IUser } from '@rocket.chat/core-typings';
 import { Meteor } from 'meteor/meteor';
-import moment, { MomentInput } from 'moment';
+import type { MomentInput } from 'moment';
+import moment from 'moment';
 
 import { hasPermission } from '../../../app/authorization/client';
 import { settings } from '../../../app/settings/client';
diff --git a/apps/meteor/client/lib/utils/formatDate.ts b/apps/meteor/client/lib/utils/formatDate.ts
index 52962e95db0..add27de4eea 100644
--- a/apps/meteor/client/lib/utils/formatDate.ts
+++ b/apps/meteor/client/lib/utils/formatDate.ts
@@ -1,6 +1,7 @@
 import mem from 'mem';
 import { Tracker } from 'meteor/tracker';
-import moment, { MomentInput } from 'moment';
+import type { MomentInput } from 'moment';
+import moment from 'moment';
 
 import { settings } from '../../../app/settings/client';
 
diff --git a/apps/meteor/client/lib/utils/formatDateAndTime.ts b/apps/meteor/client/lib/utils/formatDateAndTime.ts
index c72ec1de6a0..d8f39525695 100644
--- a/apps/meteor/client/lib/utils/formatDateAndTime.ts
+++ b/apps/meteor/client/lib/utils/formatDateAndTime.ts
@@ -1,6 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
-import moment, { MomentInput } from 'moment';
+import type { MomentInput } from 'moment';
+import moment from 'moment';
 
 import { settings } from '../../../app/settings/client';
 import { getUserPreference } from '../../../app/utils/lib/getUserPreference';
diff --git a/apps/meteor/client/lib/utils/formatTime.ts b/apps/meteor/client/lib/utils/formatTime.ts
index 9f0ee67d0c4..73746751e26 100644
--- a/apps/meteor/client/lib/utils/formatTime.ts
+++ b/apps/meteor/client/lib/utils/formatTime.ts
@@ -1,6 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
-import moment, { MomentInput } from 'moment';
+import type { MomentInput } from 'moment';
+import moment from 'moment';
 
 import { settings } from '../../../app/settings/client';
 import { getUserPreference } from '../../../app/utils/lib/getUserPreference';
diff --git a/apps/meteor/client/lib/utils/mapMessageFromApi.ts b/apps/meteor/client/lib/utils/mapMessageFromApi.ts
index c79d161eac1..113357b56a8 100644
--- a/apps/meteor/client/lib/utils/mapMessageFromApi.ts
+++ b/apps/meteor/client/lib/utils/mapMessageFromApi.ts
@@ -1,5 +1,4 @@
-import type { IMessage } from '@rocket.chat/core-typings';
-import { Serialized } from '@rocket.chat/core-typings';
+import type { IMessage, Serialized } from '@rocket.chat/core-typings';
 
 export const mapMessageFromApi = ({ attachments, tlm, ts, _updatedAt, webRtcCallEndTs, ...message }: Serialized<IMessage>): IMessage => ({
 	...message,
diff --git a/apps/meteor/client/lib/utils/messageArgs.ts b/apps/meteor/client/lib/utils/messageArgs.ts
index 6dc4231588a..83248369c99 100644
--- a/apps/meteor/client/lib/utils/messageArgs.ts
+++ b/apps/meteor/client/lib/utils/messageArgs.ts
@@ -1,4 +1,4 @@
-import { IMessage, IRoom, ISubscription, IUser, SettingValue } from '@rocket.chat/core-typings';
+import type { IMessage, IRoom, ISubscription, IUser, SettingValue } from '@rocket.chat/core-typings';
 
 export const messageArgs = (
 	context: any,
diff --git a/apps/meteor/client/lib/utils/timeAgo.ts b/apps/meteor/client/lib/utils/timeAgo.ts
index 0b83f9ae66e..809ca2be665 100644
--- a/apps/meteor/client/lib/utils/timeAgo.ts
+++ b/apps/meteor/client/lib/utils/timeAgo.ts
@@ -1,6 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
-import moment, { Moment, MomentInput } from 'moment';
+import type { Moment, MomentInput } from 'moment';
+import moment from 'moment';
 
 import { settings } from '../../../app/settings/client';
 import { t } from '../../../app/utils/client';
diff --git a/apps/meteor/client/lib/voip/Helper.ts b/apps/meteor/client/lib/voip/Helper.ts
index e6a20bee328..e54f7400675 100644
--- a/apps/meteor/client/lib/voip/Helper.ts
+++ b/apps/meteor/client/lib/voip/Helper.ts
@@ -1,4 +1,4 @@
-import { Session } from 'sip.js';
+import type { Session } from 'sip.js';
 import { SessionDescriptionHandler } from 'sip.js/lib/platform/web';
 
 /** Helper function to enable/disable media tracks. */
diff --git a/apps/meteor/client/lib/voip/LocalStream.ts b/apps/meteor/client/lib/voip/LocalStream.ts
index 94507d0a4a4..15acf7a531e 100644
--- a/apps/meteor/client/lib/voip/LocalStream.ts
+++ b/apps/meteor/client/lib/voip/LocalStream.ts
@@ -13,8 +13,9 @@
  *
  */
 
-import { Session } from 'sip.js';
-import { defaultMediaStreamFactory, MediaStreamFactory, SessionDescriptionHandler } from 'sip.js/lib/platform/web';
+import type { Session } from 'sip.js';
+import type { MediaStreamFactory, SessionDescriptionHandler } from 'sip.js/lib/platform/web';
+import { defaultMediaStreamFactory } from 'sip.js/lib/platform/web';
 
 import Stream from './Stream';
 
diff --git a/apps/meteor/client/lib/voip/QueueAggregator.ts b/apps/meteor/client/lib/voip/QueueAggregator.ts
index 1c930984bce..c268f1f413f 100644
--- a/apps/meteor/client/lib/voip/QueueAggregator.ts
+++ b/apps/meteor/client/lib/voip/QueueAggregator.ts
@@ -9,8 +9,7 @@
  * Currently the data is stored locally but may sent back to server if such need exists.
  */
 
-import type { IQueueMembershipSubscription } from '@rocket.chat/core-typings';
-import { ICallerInfo, IQueueInfo } from '@rocket.chat/core-typings';
+import type { IQueueMembershipSubscription, ICallerInfo, IQueueInfo } from '@rocket.chat/core-typings';
 
 interface IQueueServingRecord {
 	queueInfo: IQueueInfo;
diff --git a/apps/meteor/client/lib/voip/VoIPUser.ts b/apps/meteor/client/lib/voip/VoIPUser.ts
index 8d9d66dcceb..d9473c878fb 100644
--- a/apps/meteor/client/lib/voip/VoIPUser.ts
+++ b/apps/meteor/client/lib/voip/VoIPUser.ts
@@ -6,37 +6,27 @@
  * This class thus abstracts user from Browser specific media details as well as
  * SIP specific protocol details.
  */
-import {
+import type {
 	CallStates,
 	ConnectionState,
 	ICallerInfo,
 	IQueueMembershipSubscription,
-	Operation,
 	SignalingSocketEvents,
 	SocketEventKeys,
-	UserState,
 	IMediaStreamRenderer,
 	VoIPUserConfiguration,
 	VoIpCallerInfo,
 	IState,
 	VoipEvents,
-	WorkflowTypes,
 } from '@rocket.chat/core-typings';
+import { Operation, UserState, WorkflowTypes } from '@rocket.chat/core-typings';
 import { Emitter } from '@rocket.chat/emitter';
-import {
-	UserAgent,
-	UserAgentOptions,
-	Invitation,
-	InvitationAcceptOptions,
-	Session,
-	SessionState,
-	Registerer,
-	SessionInviteOptions,
-	RequestPendingError,
-	Inviter,
-} from 'sip.js';
-import { OutgoingByeRequest, OutgoingRequestDelegate, URI } from 'sip.js/lib/core';
-import { SessionDescriptionHandler, SessionDescriptionHandlerOptions } from 'sip.js/lib/platform/web';
+import type { UserAgentOptions, InvitationAcceptOptions, Session, SessionInviteOptions } from 'sip.js';
+import { UserAgent, Invitation, SessionState, Registerer, RequestPendingError, Inviter } from 'sip.js';
+import type { OutgoingByeRequest, OutgoingRequestDelegate } from 'sip.js/lib/core';
+import { URI } from 'sip.js/lib/core';
+import type { SessionDescriptionHandlerOptions } from 'sip.js/lib/platform/web';
+import { SessionDescriptionHandler } from 'sip.js/lib/platform/web';
 
 import { toggleMediaStreamTracks } from './Helper';
 import LocalStream from './LocalStream';
diff --git a/apps/meteor/client/methods/updateMessage.ts b/apps/meteor/client/methods/updateMessage.ts
index ce322684867..0f77b000e3f 100644
--- a/apps/meteor/client/methods/updateMessage.ts
+++ b/apps/meteor/client/methods/updateMessage.ts
@@ -1,4 +1,4 @@
-import { IEditedMessage } from '@rocket.chat/core-typings';
+import type { IEditedMessage } from '@rocket.chat/core-typings';
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 import moment from 'moment';
diff --git a/apps/meteor/client/portals/VideoConfPopupPortal.ts b/apps/meteor/client/portals/VideoConfPopupPortal.ts
index f6b6cff847a..5e4f22612c6 100644
--- a/apps/meteor/client/portals/VideoConfPopupPortal.ts
+++ b/apps/meteor/client/portals/VideoConfPopupPortal.ts
@@ -1,4 +1,5 @@
-import { memo, useEffect, ReactElement, ReactNode, useState } from 'react';
+import type { ReactElement, ReactNode } from 'react';
+import { memo, useEffect, useState } from 'react';
 import { createPortal } from 'react-dom';
 
 import { createAnchor } from '../lib/utils/createAnchor';
diff --git a/apps/meteor/client/providers/AuthorizationProvider.tsx b/apps/meteor/client/providers/AuthorizationProvider.tsx
index e0c7a870775..b873781de1c 100644
--- a/apps/meteor/client/providers/AuthorizationProvider.tsx
+++ b/apps/meteor/client/providers/AuthorizationProvider.tsx
@@ -1,8 +1,9 @@
-import { IRole } from '@rocket.chat/core-typings';
+import type { IRole } from '@rocket.chat/core-typings';
 import { Emitter } from '@rocket.chat/emitter';
 import { AuthorizationContext } from '@rocket.chat/ui-contexts';
 import { Meteor } from 'meteor/meteor';
-import React, { FC, useCallback, useEffect } from 'react';
+import type { FC } from 'react';
+import React, { useCallback, useEffect } from 'react';
 
 import { hasPermission, hasAtLeastOnePermission, hasAllPermission, hasRole } from '../../app/authorization/client';
 import { Roles } from '../../app/models/client/models/Roles';
diff --git a/apps/meteor/client/providers/AvatarUrlProvider.tsx b/apps/meteor/client/providers/AvatarUrlProvider.tsx
index d043ad18b68..dd6b0ccc236 100644
--- a/apps/meteor/client/providers/AvatarUrlProvider.tsx
+++ b/apps/meteor/client/providers/AvatarUrlProvider.tsx
@@ -1,5 +1,6 @@
 import { AvatarUrlContext, useSetting } from '@rocket.chat/ui-contexts';
-import React, { useMemo, FC } from 'react';
+import type { FC } from 'react';
+import React, { useMemo } from 'react';
 
 import { getURL } from '../../app/utils/lib/getURL';
 import { roomCoordinator } from '../lib/rooms/roomCoordinator';
diff --git a/apps/meteor/client/providers/CallProvider/CallProvider.tsx b/apps/meteor/client/providers/CallProvider/CallProvider.tsx
index 8aef3240b05..53bfa9fb612 100644
--- a/apps/meteor/client/providers/CallProvider/CallProvider.tsx
+++ b/apps/meteor/client/providers/CallProvider/CallProvider.tsx
@@ -1,9 +1,14 @@
-import {
+import type {
 	IVoipRoom,
 	IUser,
 	VoipEventDataSignature,
-	VoipClientEvents,
 	ICallerInfo,
+	ICallDetails,
+	ILivechatVisitor,
+	Serialized,
+} from '@rocket.chat/core-typings';
+import {
+	VoipClientEvents,
 	isVoipEventAgentCalled,
 	isVoipEventAgentConnected,
 	isVoipEventCallerJoined,
@@ -11,11 +16,9 @@ import {
 	isVoipEventQueueMemberRemoved,
 	isVoipEventCallAbandoned,
 	UserState,
-	ICallDetails,
-	ILivechatVisitor,
-	Serialized,
 } from '@rocket.chat/core-typings';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import type { Device, IExperimentalHTMLAudioElement } from '@rocket.chat/ui-contexts';
 import {
 	useRoute,
 	useUser,
@@ -24,26 +27,26 @@ import {
 	useStream,
 	useSetOutputMediaDevice,
 	useSetInputMediaDevice,
-	Device,
 	useSetModal,
-	IExperimentalHTMLAudioElement,
 	useTranslation,
 } from '@rocket.chat/ui-contexts';
 // import { useRoute, useUser, useSetting, useEndpoint, useStream, useSetModal } from '@rocket.chat/ui-contexts';
 import { Random } from 'meteor/random';
-import React, { useMemo, FC, useRef, useCallback, useEffect, useState } from 'react';
+import type { FC } from 'react';
+import React, { useMemo, useRef, useCallback, useEffect, useState } from 'react';
 import { createPortal } from 'react-dom';
-import { OutgoingByeRequest } from 'sip.js/lib/core';
+import type { OutgoingByeRequest } from 'sip.js/lib/core';
 
 import { CustomSounds } from '../../../app/custom-sounds/client';
 import { getUserPreference } from '../../../app/utils/client';
 import { isOutboundClient, useVoipClient } from '../../../ee/client/hooks/useVoipClient';
 import { parseOutboundPhoneNumber } from '../../../ee/client/lib/voip/parseOutboundPhoneNumber';
 import { WrapUpCallModal } from '../../../ee/client/voip/components/modals/WrapUpCallModal';
-import { CallContext, CallContextValue, useIsVoipEnterprise } from '../../contexts/CallContext';
+import type { CallContextValue } from '../../contexts/CallContext';
+import { CallContext, useIsVoipEnterprise } from '../../contexts/CallContext';
 import { useDialModal } from '../../hooks/useDialModal';
 import { roomCoordinator } from '../../lib/rooms/roomCoordinator';
-import { QueueAggregator } from '../../lib/voip/QueueAggregator';
+import type { QueueAggregator } from '../../lib/voip/QueueAggregator';
 
 type VoipSound = 'telephone' | 'outbound-call-ringing' | 'call-ended';
 
diff --git a/apps/meteor/client/providers/CallProvider/hooks/useWebRtcServers.ts b/apps/meteor/client/providers/CallProvider/hooks/useWebRtcServers.ts
index e843d0811bb..77e0a619565 100644
--- a/apps/meteor/client/providers/CallProvider/hooks/useWebRtcServers.ts
+++ b/apps/meteor/client/providers/CallProvider/hooks/useWebRtcServers.ts
@@ -1,7 +1,7 @@
 import { useSetting } from '@rocket.chat/ui-contexts';
 import { useMemo } from 'react';
 
-import { IceServer } from '../definitions/IceServer';
+import type { IceServer } from '../definitions/IceServer';
 import { parseStringToIceServers } from '../lib/parseStringToIceServers';
 
 export const useWebRtcServers = (): IceServer[] => {
diff --git a/apps/meteor/client/providers/CallProvider/lib/parseStringToIceServers.ts b/apps/meteor/client/providers/CallProvider/lib/parseStringToIceServers.ts
index b2d79fb78b5..6ff9554f619 100644
--- a/apps/meteor/client/providers/CallProvider/lib/parseStringToIceServers.ts
+++ b/apps/meteor/client/providers/CallProvider/lib/parseStringToIceServers.ts
@@ -1,4 +1,4 @@
-import { IceServer } from '../definitions/IceServer';
+import type { IceServer } from '../definitions/IceServer';
 
 export const parseStringToIceServer = (server: string): IceServer => {
 	const credentials = server.trim().split('@');
diff --git a/apps/meteor/client/providers/ConnectionStatusProvider.tsx b/apps/meteor/client/providers/ConnectionStatusProvider.tsx
index f279042d551..469cff990e2 100644
--- a/apps/meteor/client/providers/ConnectionStatusProvider.tsx
+++ b/apps/meteor/client/providers/ConnectionStatusProvider.tsx
@@ -1,6 +1,8 @@
-import { ConnectionStatusContext, ConnectionStatusContextValue } from '@rocket.chat/ui-contexts';
+import type { ConnectionStatusContextValue } from '@rocket.chat/ui-contexts';
+import { ConnectionStatusContext } from '@rocket.chat/ui-contexts';
 import { Meteor } from 'meteor/meteor';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import { useReactiveValue } from '../hooks/useReactiveValue';
 
diff --git a/apps/meteor/client/providers/CustomSoundProvider.tsx b/apps/meteor/client/providers/CustomSoundProvider.tsx
index a7581df6a20..771214c4a8d 100644
--- a/apps/meteor/client/providers/CustomSoundProvider.tsx
+++ b/apps/meteor/client/providers/CustomSoundProvider.tsx
@@ -1,5 +1,6 @@
 import { CustomSoundContext } from '@rocket.chat/ui-contexts';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import { CustomSounds } from '../../app/custom-sounds/client/lib/CustomSounds';
 
diff --git a/apps/meteor/client/providers/DeviceProvider/DeviceProvider.tsx b/apps/meteor/client/providers/DeviceProvider/DeviceProvider.tsx
index 8ab12e850b3..90ced3b0459 100644
--- a/apps/meteor/client/providers/DeviceProvider/DeviceProvider.tsx
+++ b/apps/meteor/client/providers/DeviceProvider/DeviceProvider.tsx
@@ -1,6 +1,8 @@
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { DeviceContext, Device, IExperimentalHTMLAudioElement, DeviceContextValue } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, ReactNode, useEffect, useState, useMemo } from 'react';
+import type { Device, IExperimentalHTMLAudioElement, DeviceContextValue } from '@rocket.chat/ui-contexts';
+import { DeviceContext } from '@rocket.chat/ui-contexts';
+import type { ReactElement, ReactNode } from 'react';
+import React, { useEffect, useState, useMemo } from 'react';
 
 import { isSetSinkIdAvailable } from './lib/isSetSinkIdAvailable';
 
diff --git a/apps/meteor/client/providers/DeviceProvider/lib/isSetSinkIdAvailable.tsx b/apps/meteor/client/providers/DeviceProvider/lib/isSetSinkIdAvailable.tsx
index 133c957ab73..65bf99ed116 100644
--- a/apps/meteor/client/providers/DeviceProvider/lib/isSetSinkIdAvailable.tsx
+++ b/apps/meteor/client/providers/DeviceProvider/lib/isSetSinkIdAvailable.tsx
@@ -1,4 +1,4 @@
-import { IExperimentalHTMLAudioElement } from '@rocket.chat/ui-contexts';
+import type { IExperimentalHTMLAudioElement } from '@rocket.chat/ui-contexts';
 
 export const isSetSinkIdAvailable = (): boolean => {
 	const audio = new Audio() as IExperimentalHTMLAudioElement;
diff --git a/apps/meteor/client/providers/LayoutProvider.tsx b/apps/meteor/client/providers/LayoutProvider.tsx
index 137be9ea755..959a8666e80 100644
--- a/apps/meteor/client/providers/LayoutProvider.tsx
+++ b/apps/meteor/client/providers/LayoutProvider.tsx
@@ -1,6 +1,7 @@
 import { useBreakpoints } from '@rocket.chat/fuselage-hooks';
 import { LayoutContext, useQueryStringParameter, useSetting } from '@rocket.chat/ui-contexts';
-import React, { FC, useMemo } from 'react';
+import type { FC } from 'react';
+import React, { useMemo } from 'react';
 
 import { menu } from '../../app/ui-utils/client';
 
diff --git a/apps/meteor/client/providers/MeteorProvider.tsx b/apps/meteor/client/providers/MeteorProvider.tsx
index 5a5454fc68e..e4bd8c946e2 100644
--- a/apps/meteor/client/providers/MeteorProvider.tsx
+++ b/apps/meteor/client/providers/MeteorProvider.tsx
@@ -1,4 +1,5 @@
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import AttachmentProvider from '../components/message/Attachments/providers/AttachmentProvider';
 import AuthorizationProvider from './AuthorizationProvider';
diff --git a/apps/meteor/client/providers/ModalProvider.tsx b/apps/meteor/client/providers/ModalProvider.tsx
index 868cccf5005..db72140e89c 100644
--- a/apps/meteor/client/providers/ModalProvider.tsx
+++ b/apps/meteor/client/providers/ModalProvider.tsx
@@ -1,5 +1,6 @@
 import { ModalContext } from '@rocket.chat/ui-contexts';
-import React, { useState, useMemo, memo, ReactNode, ReactElement } from 'react';
+import type { ReactNode, ReactElement } from 'react';
+import React, { useState, useMemo, memo } from 'react';
 
 import { modal } from '../../app/ui-utils/client/lib/modal';
 import { useImperativeModal } from '../views/hooks/useImperativeModal';
diff --git a/apps/meteor/client/providers/OmnichannelProvider.tsx b/apps/meteor/client/providers/OmnichannelProvider.tsx
index 16585aea1a0..5905d7f0953 100644
--- a/apps/meteor/client/providers/OmnichannelProvider.tsx
+++ b/apps/meteor/client/providers/OmnichannelProvider.tsx
@@ -1,14 +1,15 @@
-import type { IOmnichannelAgent, IRoom } from '@rocket.chat/core-typings';
-import { OmichannelRoutingConfig } from '@rocket.chat/core-typings';
+import type { IOmnichannelAgent, IRoom, OmichannelRoutingConfig } from '@rocket.chat/core-typings';
 import { useSafely } from '@rocket.chat/fuselage-hooks';
 import { useUser, useSetting, usePermission, useMethod } from '@rocket.chat/ui-contexts';
-import React, { useState, useEffect, FC, useMemo, useCallback, memo, useRef } from 'react';
+import type { FC } from 'react';
+import React, { useState, useEffect, useMemo, useCallback, memo, useRef } from 'react';
 
 import { LivechatInquiry } from '../../app/livechat/client/collections/LivechatInquiry';
 import { initializeLivechatInquiryStream } from '../../app/livechat/client/lib/stream/queueManager';
 import { Notifications } from '../../app/notifications/client';
 import { ClientLogger } from '../../lib/ClientLogger';
-import { OmnichannelContext, OmnichannelContextValue } from '../contexts/OmnichannelContext';
+import type { OmnichannelContextValue } from '../contexts/OmnichannelContext';
+import { OmnichannelContext } from '../contexts/OmnichannelContext';
 import { useReactiveValue } from '../hooks/useReactiveValue';
 
 const emptyContextValue: OmnichannelContextValue = {
diff --git a/apps/meteor/client/providers/RouterProvider.tsx b/apps/meteor/client/providers/RouterProvider.tsx
index 45c3b41e9fc..fab86349154 100644
--- a/apps/meteor/client/providers/RouterProvider.tsx
+++ b/apps/meteor/client/providers/RouterProvider.tsx
@@ -1,6 +1,8 @@
-import { RouterContext, RouterContextValue } from '@rocket.chat/ui-contexts';
+import type { RouterContextValue } from '@rocket.chat/ui-contexts';
+import { RouterContext } from '@rocket.chat/ui-contexts';
 import { FlowRouter } from 'meteor/kadira:flow-router';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import { createSubscription } from '../lib/createSubscription';
 
diff --git a/apps/meteor/client/providers/ServerProvider.tsx b/apps/meteor/client/providers/ServerProvider.tsx
index 6d58b1f082b..068e9f78c43 100644
--- a/apps/meteor/client/providers/ServerProvider.tsx
+++ b/apps/meteor/client/providers/ServerProvider.tsx
@@ -1,8 +1,10 @@
-import { Serialized } from '@rocket.chat/core-typings';
+import type { Serialized } from '@rocket.chat/core-typings';
 import type { Method, PathFor, MatchPathPattern, OperationParams, OperationResult } from '@rocket.chat/rest-typings';
-import { ServerContext, ServerMethodName, ServerMethodParameters, ServerMethodReturn, UploadResult } from '@rocket.chat/ui-contexts';
+import type { ServerMethodName, ServerMethodParameters, ServerMethodReturn, UploadResult } from '@rocket.chat/ui-contexts';
+import { ServerContext } from '@rocket.chat/ui-contexts';
 import { Meteor } from 'meteor/meteor';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import { Info as info, APIClient } from '../../app/utils/client';
 
diff --git a/apps/meteor/client/providers/SessionProvider.tsx b/apps/meteor/client/providers/SessionProvider.tsx
index 05556f5e172..a934ddd53a9 100644
--- a/apps/meteor/client/providers/SessionProvider.tsx
+++ b/apps/meteor/client/providers/SessionProvider.tsx
@@ -1,6 +1,7 @@
 import { SessionContext } from '@rocket.chat/ui-contexts';
 import { Session } from 'meteor/session';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import { createReactiveSubscriptionFactory } from '../lib/createReactiveSubscriptionFactory';
 
diff --git a/apps/meteor/client/providers/SettingsProvider.tsx b/apps/meteor/client/providers/SettingsProvider.tsx
index e6c7fc5f4ac..5ab0f770b5b 100644
--- a/apps/meteor/client/providers/SettingsProvider.tsx
+++ b/apps/meteor/client/providers/SettingsProvider.tsx
@@ -1,6 +1,8 @@
-import { SettingsContext, SettingsContextValue, useAtLeastOnePermission, useMethod } from '@rocket.chat/ui-contexts';
+import type { SettingsContextValue } from '@rocket.chat/ui-contexts';
+import { SettingsContext, useAtLeastOnePermission, useMethod } from '@rocket.chat/ui-contexts';
 import { Tracker } from 'meteor/tracker';
-import React, { useCallback, useEffect, useMemo, useState, FunctionComponent } from 'react';
+import type { FunctionComponent } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 
 import { createReactiveSubscriptionFactory } from '../lib/createReactiveSubscriptionFactory';
 import { queryClient } from '../lib/queryClient';
diff --git a/apps/meteor/client/providers/ToastMessagesProvider.tsx b/apps/meteor/client/providers/ToastMessagesProvider.tsx
index cf26621b292..d85e53996d3 100644
--- a/apps/meteor/client/providers/ToastMessagesProvider.tsx
+++ b/apps/meteor/client/providers/ToastMessagesProvider.tsx
@@ -1,6 +1,7 @@
 import { ToastBarProvider, useToastBarDispatch } from '@rocket.chat/fuselage-toastbar';
 import { ToastMessagesContext } from '@rocket.chat/ui-contexts';
-import React, { FC, useEffect } from 'react';
+import type { FC } from 'react';
+import React, { useEffect } from 'react';
 
 import { getErrorMessage } from '../lib/errorHandling';
 import { dispatchToastMessage, subscribeToToastMessages } from '../lib/toast';
diff --git a/apps/meteor/client/providers/TooltipProvider.tsx b/apps/meteor/client/providers/TooltipProvider.tsx
index 74d4e3d24aa..4fb6abaae6b 100644
--- a/apps/meteor/client/providers/TooltipProvider.tsx
+++ b/apps/meteor/client/providers/TooltipProvider.tsx
@@ -1,7 +1,8 @@
 import { useMediaQuery } from '@rocket.chat/fuselage-hooks';
 import { TooltipComponent } from '@rocket.chat/ui-client';
 import { TooltipContext } from '@rocket.chat/ui-contexts';
-import React, { FC, useEffect, useState, useMemo, ReactNode, useRef, memo } from 'react';
+import type { FC, ReactNode } from 'react';
+import React, { useEffect, useState, useMemo, useRef, memo } from 'react';
 
 import TooltipPortal from '../components/TooltipPortal';
 
diff --git a/apps/meteor/client/providers/TranslationProvider.tsx b/apps/meteor/client/providers/TranslationProvider.tsx
index 1aac1f0aafb..711779ae52c 100644
--- a/apps/meteor/client/providers/TranslationProvider.tsx
+++ b/apps/meteor/client/providers/TranslationProvider.tsx
@@ -1,9 +1,11 @@
-import { TranslationContext, TranslationKey, useAbsoluteUrl } from '@rocket.chat/ui-contexts';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { TranslationContext, useAbsoluteUrl } from '@rocket.chat/ui-contexts';
 import i18next from 'i18next';
 import I18NextHttpBackend from 'i18next-http-backend';
 import { TAPi18n, TAPi18next } from 'meteor/rocketchat:tap-i18n';
 import { Tracker } from 'meteor/tracker';
-import React, { ReactElement, ReactNode, useEffect, useMemo, useState } from 'react';
+import type { ReactElement, ReactNode } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 import { I18nextProvider, initReactI18next } from 'react-i18next';
 
 import { useReactiveValue } from '../hooks/useReactiveValue';
@@ -66,10 +68,10 @@ const createTranslateFunction = (
 	Tracker.nonreactive(() => {
 		const translate = (key: TranslationKey, ...replaces: unknown[]): string => {
 			if (typeof replaces[0] === 'object') {
-				const [options, lang_tag = language] = replaces;
+				const [options, lng = language] = replaces;
 				return TAPi18next.t(key, {
 					ns: 'project',
-					lng: String(lang_tag),
+					lng: String(lng),
 					...options,
 				});
 			}
diff --git a/apps/meteor/client/providers/UserProvider.tsx b/apps/meteor/client/providers/UserProvider.tsx
index a05435a42e6..c0361867edd 100644
--- a/apps/meteor/client/providers/UserProvider.tsx
+++ b/apps/meteor/client/providers/UserProvider.tsx
@@ -1,7 +1,9 @@
 import type { IRoom, ISubscription, IUser } from '@rocket.chat/core-typings';
-import { UserContext, LoginService, useSetting } from '@rocket.chat/ui-contexts';
+import type { LoginService } from '@rocket.chat/ui-contexts';
+import { UserContext, useSetting } from '@rocket.chat/ui-contexts';
 import { Meteor } from 'meteor/meteor';
-import React, { FC, useEffect, useMemo } from 'react';
+import type { FC } from 'react';
+import React, { useEffect, useMemo } from 'react';
 
 import { Subscriptions, Rooms } from '../../app/models/client';
 import { getUserPreference } from '../../app/utils/client';
diff --git a/apps/meteor/client/providers/VideoConfProvider.tsx b/apps/meteor/client/providers/VideoConfProvider.tsx
index f29d2651e6b..390b4baed71 100644
--- a/apps/meteor/client/providers/VideoConfProvider.tsx
+++ b/apps/meteor/client/providers/VideoConfProvider.tsx
@@ -1,10 +1,13 @@
-import { IRoom } from '@rocket.chat/core-typings';
+import type { IRoom } from '@rocket.chat/core-typings';
 import { useSetModal } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useState, ReactNode, useMemo, useEffect } from 'react';
-import { Unsubscribe } from 'use-subscription';
+import type { ReactElement, ReactNode } from 'react';
+import React, { useState, useMemo, useEffect } from 'react';
+import type { Unsubscribe } from 'use-subscription';
 
-import { VideoConfContext, VideoConfPopupPayload } from '../contexts/VideoConfContext';
-import { VideoConfManager, DirectCallParams, ProviderCapabilities, CallPreferences } from '../lib/VideoConfManager';
+import type { VideoConfPopupPayload } from '../contexts/VideoConfContext';
+import { VideoConfContext } from '../contexts/VideoConfContext';
+import type { DirectCallParams, ProviderCapabilities, CallPreferences } from '../lib/VideoConfManager';
+import { VideoConfManager } from '../lib/VideoConfManager';
 import VideoConfBlockModal from '../views/room/contextualBar/VideoConference/VideoConfBlockModal';
 import VideoConfPopups from '../views/room/contextualBar/VideoConference/VideoConfPopups';
 
diff --git a/apps/meteor/client/sidebar/Item/Condensed.stories.tsx b/apps/meteor/client/sidebar/Item/Condensed.stories.tsx
index ef4d434ce0f..e50297a9bec 100644
--- a/apps/meteor/client/sidebar/Item/Condensed.stories.tsx
+++ b/apps/meteor/client/sidebar/Item/Condensed.stories.tsx
@@ -1,6 +1,6 @@
 import { Box, IconButton } from '@rocket.chat/fuselage';
 import { action } from '@storybook/addon-actions';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import * as Status from '../../components/UserStatus';
diff --git a/apps/meteor/client/sidebar/Item/Condensed.tsx b/apps/meteor/client/sidebar/Item/Condensed.tsx
index 2378bbd0537..9a8988a6ed0 100644
--- a/apps/meteor/client/sidebar/Item/Condensed.tsx
+++ b/apps/meteor/client/sidebar/Item/Condensed.tsx
@@ -1,6 +1,8 @@
-import { IconButton, Sidebar, IconProps } from '@rocket.chat/fuselage';
+import type { IconProps } from '@rocket.chat/fuselage';
+import { IconButton, Sidebar } from '@rocket.chat/fuselage';
 import { useMutableCallback, usePrefersReducedMotion } from '@rocket.chat/fuselage-hooks';
-import React, { FC, memo, ReactElement, useState } from 'react';
+import type { FC, ReactElement } from 'react';
+import React, { memo, useState } from 'react';
 
 type CondensedProps = {
 	title: ReactElement | string;
diff --git a/apps/meteor/client/sidebar/Item/Extended.stories.tsx b/apps/meteor/client/sidebar/Item/Extended.stories.tsx
index 50e7bbf972b..389519a7c27 100644
--- a/apps/meteor/client/sidebar/Item/Extended.stories.tsx
+++ b/apps/meteor/client/sidebar/Item/Extended.stories.tsx
@@ -1,6 +1,6 @@
 import { Box, IconButton, Badge } from '@rocket.chat/fuselage';
 import { action } from '@storybook/addon-actions';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import * as Status from '../../components/UserStatus';
diff --git a/apps/meteor/client/sidebar/Item/Extended.tsx b/apps/meteor/client/sidebar/Item/Extended.tsx
index a80a86551a6..a23b55ff10d 100644
--- a/apps/meteor/client/sidebar/Item/Extended.tsx
+++ b/apps/meteor/client/sidebar/Item/Extended.tsx
@@ -1,6 +1,8 @@
-import { Sidebar, IconButton, IconProps } from '@rocket.chat/fuselage';
+import type { IconProps } from '@rocket.chat/fuselage';
+import { Sidebar, IconButton } from '@rocket.chat/fuselage';
 import { useMutableCallback, usePrefersReducedMotion } from '@rocket.chat/fuselage-hooks';
-import React, { memo, useState, VFC } from 'react';
+import type { VFC } from 'react';
+import React, { memo, useState } from 'react';
 
 import { useShortTimeAgo } from '../../hooks/useTimeAgo';
 
diff --git a/apps/meteor/client/sidebar/Item/Medium.stories.tsx b/apps/meteor/client/sidebar/Item/Medium.stories.tsx
index 62e913a69d7..4048b426f01 100644
--- a/apps/meteor/client/sidebar/Item/Medium.stories.tsx
+++ b/apps/meteor/client/sidebar/Item/Medium.stories.tsx
@@ -1,6 +1,6 @@
 import { Box, IconButton } from '@rocket.chat/fuselage';
 import { action } from '@storybook/addon-actions';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import * as Status from '../../components/UserStatus';
diff --git a/apps/meteor/client/sidebar/Item/Medium.tsx b/apps/meteor/client/sidebar/Item/Medium.tsx
index 6511713b0f1..180787ba604 100644
--- a/apps/meteor/client/sidebar/Item/Medium.tsx
+++ b/apps/meteor/client/sidebar/Item/Medium.tsx
@@ -1,6 +1,7 @@
 import { Sidebar, IconButton } from '@rocket.chat/fuselage';
 import { useMutableCallback, usePrefersReducedMotion } from '@rocket.chat/fuselage-hooks';
-import React, { memo, useState, VFC } from 'react';
+import type { VFC } from 'react';
+import React, { memo, useState } from 'react';
 
 type MediumProps = {
 	title: React.ReactNode;
diff --git a/apps/meteor/client/sidebar/RoomList/RoomList.tsx b/apps/meteor/client/sidebar/RoomList/RoomList.tsx
index da353718ff4..09ad31e2b50 100644
--- a/apps/meteor/client/sidebar/RoomList/RoomList.tsx
+++ b/apps/meteor/client/sidebar/RoomList/RoomList.tsx
@@ -1,8 +1,9 @@
-import { IRoom } from '@rocket.chat/core-typings';
+import type { IRoom } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
 import { useResizeObserver } from '@rocket.chat/fuselage-hooks';
 import { useSession, useUserPreference, useUserId, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useMemo, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo } from 'react';
 import { Virtuoso } from 'react-virtuoso';
 
 import { useAvatarTemplate } from '../hooks/useAvatarTemplate';
diff --git a/apps/meteor/client/sidebar/RoomList/RoomListRow.tsx b/apps/meteor/client/sidebar/RoomList/RoomListRow.tsx
index 955e185ce3e..026a9a083e5 100644
--- a/apps/meteor/client/sidebar/RoomList/RoomListRow.tsx
+++ b/apps/meteor/client/sidebar/RoomList/RoomListRow.tsx
@@ -1,11 +1,12 @@
-import { IRoom, ISubscription } from '@rocket.chat/core-typings';
+import type { IRoom, ISubscription } from '@rocket.chat/core-typings';
 import { SidebarSection } from '@rocket.chat/fuselage';
-import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ComponentType, memo, useMemo, ReactElement } from 'react';
+import type { useTranslation } from '@rocket.chat/ui-contexts';
+import type { ComponentType, ReactElement } from 'react';
+import React, { memo, useMemo } from 'react';
 
 import { useVideoConfAcceptCall, useVideoConfRejectIncomingCall, useVideoConfIncomingCalls } from '../../contexts/VideoConfContext';
-import { useAvatarTemplate } from '../hooks/useAvatarTemplate';
-import { useTemplateByViewMode } from '../hooks/useTemplateByViewMode';
+import type { useAvatarTemplate } from '../hooks/useAvatarTemplate';
+import type { useTemplateByViewMode } from '../hooks/useTemplateByViewMode';
 import OmnichannelSection from '../sections/OmnichannelSection';
 import SideBarItemTemplateWithData from './SideBarItemTemplateWithData';
 
diff --git a/apps/meteor/client/sidebar/RoomList/ScrollerWithCustomProps.tsx b/apps/meteor/client/sidebar/RoomList/ScrollerWithCustomProps.tsx
index 942a2dc6431..df63abee948 100644
--- a/apps/meteor/client/sidebar/RoomList/ScrollerWithCustomProps.tsx
+++ b/apps/meteor/client/sidebar/RoomList/ScrollerWithCustomProps.tsx
@@ -1,4 +1,5 @@
-import React, { forwardRef, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { forwardRef } from 'react';
 
 import ScrollableContentWrapper from '../../components/ScrollableContentWrapper';
 
diff --git a/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx b/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx
index 96fe5b41bee..a25b47d1050 100644
--- a/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx
+++ b/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx
@@ -1,20 +1,16 @@
 /* eslint-disable react/display-name */
-import {
-	IMessage,
-	IRoom,
-	isDirectMessageRoom,
-	isMultipleDirectMessageRoom,
-	isOmnichannelRoom,
-	ISubscription,
-} from '@rocket.chat/core-typings';
+import type { IMessage, IRoom, ISubscription } from '@rocket.chat/core-typings';
+import { isDirectMessageRoom, isMultipleDirectMessageRoom, isOmnichannelRoom } from '@rocket.chat/core-typings';
 import { Badge, Sidebar, SidebarItemAction } from '@rocket.chat/fuselage';
-import { useLayout, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { AllHTMLAttributes, ComponentType, memo, ReactElement, ReactNode, useMemo } from 'react';
+import type { useTranslation } from '@rocket.chat/ui-contexts';
+import { useLayout } from '@rocket.chat/ui-contexts';
+import type { AllHTMLAttributes, ComponentType, ReactElement, ReactNode } from 'react';
+import React, { memo, useMemo } from 'react';
 
 import { RoomIcon } from '../../components/RoomIcon';
 import { roomCoordinator } from '../../lib/rooms/roomCoordinator';
 import RoomMenu from '../RoomMenu';
-import { useAvatarTemplate } from '../hooks/useAvatarTemplate';
+import type { useAvatarTemplate } from '../hooks/useAvatarTemplate';
 import { normalizeSidebarMessage } from './normalizeSidebarMessage';
 
 const getMessage = (room: IRoom, lastMessage: IMessage | undefined, t: ReturnType<typeof useTranslation>): string | undefined => {
diff --git a/apps/meteor/client/sidebar/RoomList/normalizeSidebarMessage.ts b/apps/meteor/client/sidebar/RoomList/normalizeSidebarMessage.ts
index c2919fddbb1..f7cb2edd5ff 100644
--- a/apps/meteor/client/sidebar/RoomList/normalizeSidebarMessage.ts
+++ b/apps/meteor/client/sidebar/RoomList/normalizeSidebarMessage.ts
@@ -1,6 +1,6 @@
-import { IMessage } from '@rocket.chat/core-typings';
+import type { IMessage } from '@rocket.chat/core-typings';
 import { escapeHTML } from '@rocket.chat/string-helpers';
-import { useTranslation } from '@rocket.chat/ui-contexts';
+import type { useTranslation } from '@rocket.chat/ui-contexts';
 
 import { filterMarkdown } from '../../../app/markdown/lib/markdown';
 
diff --git a/apps/meteor/client/sidebar/RoomMenu.tsx b/apps/meteor/client/sidebar/RoomMenu.tsx
index ccff4984bb4..e7eeee1bcca 100644
--- a/apps/meteor/client/sidebar/RoomMenu.tsx
+++ b/apps/meteor/client/sidebar/RoomMenu.tsx
@@ -1,6 +1,7 @@
-import { RoomType } from '@rocket.chat/core-typings';
+import type { RoomType } from '@rocket.chat/core-typings';
 import { Option, Menu } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import type { TranslationKey, Fields } from '@rocket.chat/ui-contexts';
 import {
 	useSetModal,
 	useToastMessageDispatch,
@@ -10,11 +11,10 @@ import {
 	usePermission,
 	useMethod,
 	useTranslation,
-	TranslationKey,
-	Fields,
 	useEndpoint,
 } from '@rocket.chat/ui-contexts';
-import React, { memo, ReactElement, useMemo } from 'react';
+import type { ReactElement } from 'react';
+import React, { memo, useMemo } from 'react';
 
 import { RoomManager } from '../../app/ui-utils/client';
 import { UiTextContext } from '../../definition/IRoomTypeConfig';
diff --git a/apps/meteor/client/sidebar/Sidebar.stories.tsx b/apps/meteor/client/sidebar/Sidebar.stories.tsx
index bf2e7f7579b..95896f82f13 100644
--- a/apps/meteor/client/sidebar/Sidebar.stories.tsx
+++ b/apps/meteor/client/sidebar/Sidebar.stories.tsx
@@ -1,8 +1,10 @@
 import type { ISetting, ISubscription } from '@rocket.chat/core-typings';
-import { UserContext, SettingsContext, LoginService } from '@rocket.chat/ui-contexts';
-import { Meta, Story } from '@storybook/react';
+import type { LoginService } from '@rocket.chat/ui-contexts';
+import { UserContext, SettingsContext } from '@rocket.chat/ui-contexts';
+import type { Meta, Story } from '@storybook/react';
 import type { ObjectId } from 'mongodb';
-import React, { ContextType } from 'react';
+import type { ContextType } from 'react';
+import React from 'react';
 
 import RoomList from './RoomList/index';
 import Header from './header';
diff --git a/apps/meteor/client/sidebar/footer/SidebarFooter.tsx b/apps/meteor/client/sidebar/footer/SidebarFooter.tsx
index 489606cf40f..f31f1a3e6b8 100644
--- a/apps/meteor/client/sidebar/footer/SidebarFooter.tsx
+++ b/apps/meteor/client/sidebar/footer/SidebarFooter.tsx
@@ -1,4 +1,5 @@
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { useIsCallEnabled, useIsCallReady } from '../../contexts/CallContext';
 import SidebarFooterDefault from './SidebarFooterDefault';
diff --git a/apps/meteor/client/sidebar/footer/SidebarFooterDefault.tsx b/apps/meteor/client/sidebar/footer/SidebarFooterDefault.tsx
index 38e1b9fe1b0..41e61b31eb6 100644
--- a/apps/meteor/client/sidebar/footer/SidebarFooterDefault.tsx
+++ b/apps/meteor/client/sidebar/footer/SidebarFooterDefault.tsx
@@ -1,6 +1,7 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Divider, Palette, SidebarFooter as Footer } from '@rocket.chat/fuselage';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { settings } from '../../../app/settings/client';
 import { SidebarFooterWatermark } from '../../../ee/client/sidebar/footer/SidebarFooterWatermark';
diff --git a/apps/meteor/client/sidebar/footer/voip/VoipFooter.stories.tsx b/apps/meteor/client/sidebar/footer/voip/VoipFooter.stories.tsx
index 0cce790a2e0..f22717c5b36 100644
--- a/apps/meteor/client/sidebar/footer/voip/VoipFooter.stories.tsx
+++ b/apps/meteor/client/sidebar/footer/voip/VoipFooter.stories.tsx
@@ -1,6 +1,6 @@
-import { VoIpCallerInfo } from '@rocket.chat/core-typings';
+import type { VoIpCallerInfo } from '@rocket.chat/core-typings';
 import { Box, Icon } from '@rocket.chat/fuselage';
-import { ComponentStory } from '@storybook/react';
+import type { ComponentStory } from '@storybook/react';
 import React, { useState } from 'react';
 
 import { VoipFooter } from './VoipFooter';
diff --git a/apps/meteor/client/sidebar/footer/voip/VoipFooter.tsx b/apps/meteor/client/sidebar/footer/voip/VoipFooter.tsx
index 053bc5ef7ad..e390eb654ea 100644
--- a/apps/meteor/client/sidebar/footer/voip/VoipFooter.tsx
+++ b/apps/meteor/client/sidebar/footer/voip/VoipFooter.tsx
@@ -1,12 +1,13 @@
-import type { IVoipRoom } from '@rocket.chat/core-typings';
-import { ICallerInfo, VoIpCallerInfo, VoipClientEvents } from '@rocket.chat/core-typings';
+import type { IVoipRoom, ICallerInfo, VoIpCallerInfo } from '@rocket.chat/core-typings';
+import { VoipClientEvents } from '@rocket.chat/core-typings';
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Button, ButtonGroup, Icon, SidebarFooter, Menu, IconButton } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, MouseEvent, ReactNode } from 'react';
+import type { ReactElement, MouseEvent, ReactNode } from 'react';
+import React from 'react';
 
 import type { VoipFooterMenuOptions } from '../../../../ee/client/hooks/useVoipFooterMenu';
-import { CallActionsType } from '../../../contexts/CallContext';
+import type { CallActionsType } from '../../../contexts/CallContext';
 import { useOmnichannelContactLabel } from './hooks/useOmnichannelContactLabel';
 
 type VoipFooterPropsType = {
diff --git a/apps/meteor/client/sidebar/footer/voip/hooks/useOmnichannelContactLabel.ts b/apps/meteor/client/sidebar/footer/voip/hooks/useOmnichannelContactLabel.ts
index b7df8cbcf0d..e905f6cf38e 100644
--- a/apps/meteor/client/sidebar/footer/voip/hooks/useOmnichannelContactLabel.ts
+++ b/apps/meteor/client/sidebar/footer/voip/hooks/useOmnichannelContactLabel.ts
@@ -1,4 +1,4 @@
-import { ICallerInfo } from '@rocket.chat/core-typings';
+import type { ICallerInfo } from '@rocket.chat/core-typings';
 import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 
diff --git a/apps/meteor/client/sidebar/footer/voip/index.tsx b/apps/meteor/client/sidebar/footer/voip/index.tsx
index 6e9d78d62c6..70ad626044a 100644
--- a/apps/meteor/client/sidebar/footer/voip/index.tsx
+++ b/apps/meteor/client/sidebar/footer/voip/index.tsx
@@ -1,6 +1,7 @@
 import type { VoIpCallerInfo } from '@rocket.chat/core-typings';
 import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useCallback, useMemo, useState } from 'react';
+import type { ReactElement } from 'react';
+import React, { useCallback, useMemo, useState } from 'react';
 
 import { useVoipFooterMenu } from '../../../../ee/client/hooks/useVoipFooterMenu';
 import {
diff --git a/apps/meteor/client/sidebar/header/CreateChannel.tsx b/apps/meteor/client/sidebar/header/CreateChannel.tsx
index 151a23277ba..282761d9f7b 100644
--- a/apps/meteor/client/sidebar/header/CreateChannel.tsx
+++ b/apps/meteor/client/sidebar/header/CreateChannel.tsx
@@ -1,7 +1,9 @@
 import { Box, Modal, Button, TextInput, Icon, Field, ToggleSwitch, FieldGroup } from '@rocket.chat/fuselage';
 import { useDebouncedCallback } from '@rocket.chat/fuselage-hooks';
-import { useSetting, useTranslation, TranslationKey, useEndpoint, usePermission } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useEffect, useMemo, useState } from 'react';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useSetting, useTranslation, useEndpoint, usePermission } from '@rocket.chat/ui-contexts';
+import type { ReactElement } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 
 import { useHasLicenseModule } from '../../../ee/client/hooks/useHasLicenseModule';
 import UserAutoCompleteMultipleFederated from '../../components/UserAutoCompleteMultiple/UserAutoCompleteMultipleFederated';
diff --git a/apps/meteor/client/sidebar/header/CreateChannelWithData.tsx b/apps/meteor/client/sidebar/header/CreateChannelWithData.tsx
index 640fe853068..72b5de9a8c6 100644
--- a/apps/meteor/client/sidebar/header/CreateChannelWithData.tsx
+++ b/apps/meteor/client/sidebar/header/CreateChannelWithData.tsx
@@ -1,12 +1,14 @@
-import { RoomType } from '@rocket.chat/core-typings';
+import type { RoomType } from '@rocket.chat/core-typings';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useSetting, usePermission } from '@rocket.chat/ui-contexts';
-import React, { memo, ReactElement, useCallback, useMemo, ComponentProps } from 'react';
+import type { ReactElement, ComponentProps } from 'react';
+import React, { memo, useCallback, useMemo } from 'react';
 
 import { useEndpointActionExperimental } from '../../hooks/useEndpointActionExperimental';
 import { useForm } from '../../hooks/useForm';
 import { goToRoomById } from '../../lib/utils/goToRoomById';
-import CreateChannel, { CreateChannelProps } from './CreateChannel';
+import type { CreateChannelProps } from './CreateChannel';
+import CreateChannel from './CreateChannel';
 
 type CreateChannelWithDataProps = {
 	onClose: () => void;
diff --git a/apps/meteor/client/sidebar/header/CreateDirectMessage.tsx b/apps/meteor/client/sidebar/header/CreateDirectMessage.tsx
index 20babcb7ce7..9309c07aee9 100644
--- a/apps/meteor/client/sidebar/header/CreateDirectMessage.tsx
+++ b/apps/meteor/client/sidebar/header/CreateDirectMessage.tsx
@@ -2,7 +2,8 @@ import type { IUser } from '@rocket.chat/core-typings';
 import { Box, Modal, Button } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, useState, memo } from 'react';
+import type { FC } from 'react';
+import React, { useState, memo } from 'react';
 
 import UserAutoCompleteMultipleFederated from '../../components/UserAutoCompleteMultiple/UserAutoCompleteMultipleFederated';
 import { useEndpointActionExperimental } from '../../hooks/useEndpointActionExperimental';
diff --git a/apps/meteor/client/sidebar/header/CreateTeam/CreateTeamModal.tsx b/apps/meteor/client/sidebar/header/CreateTeam/CreateTeamModal.tsx
index 7db9e4baa95..19837bb2322 100644
--- a/apps/meteor/client/sidebar/header/CreateTeam/CreateTeamModal.tsx
+++ b/apps/meteor/client/sidebar/header/CreateTeam/CreateTeamModal.tsx
@@ -1,7 +1,8 @@
 import type { IUser } from '@rocket.chat/core-typings';
 import { Box, Modal, Button, TextInput, Field, ToggleSwitch, FieldGroup, Icon } from '@rocket.chat/fuselage';
 import { useTranslation, useSetting, usePermission, useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
-import React, { memo, useMemo, ReactElement, useEffect } from 'react';
+import type { ReactElement } from 'react';
+import React, { memo, useMemo, useEffect } from 'react';
 import { useForm, Controller } from 'react-hook-form';
 
 import UserAutoCompleteMultiple from '../../../components/UserAutoCompleteMultiple';
diff --git a/apps/meteor/client/sidebar/header/EditStatusModal.tsx b/apps/meteor/client/sidebar/header/EditStatusModal.tsx
index 2ec172e1b6b..9f9cd3be723 100644
--- a/apps/meteor/client/sidebar/header/EditStatusModal.tsx
+++ b/apps/meteor/client/sidebar/header/EditStatusModal.tsx
@@ -2,7 +2,8 @@ import type { IUser } from '@rocket.chat/core-typings';
 import { Field, TextInput, FieldGroup, Modal, Button } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useToastMessageDispatch, useSetting, useTranslation, useEndpoint } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useState, ChangeEvent, useCallback } from 'react';
+import type { ReactElement, ChangeEvent } from 'react';
+import React, { useState, useCallback } from 'react';
 
 import UserStatusMenu from '../../components/UserStatusMenu';
 import { USER_STATUS_TEXT_MAX_LENGTH } from '../../lib/constants';
diff --git a/apps/meteor/client/sidebar/header/UserAvatarButton.tsx b/apps/meteor/client/sidebar/header/UserAvatarButton.tsx
index d81914978a7..cd32fd16905 100644
--- a/apps/meteor/client/sidebar/header/UserAvatarButton.tsx
+++ b/apps/meteor/client/sidebar/header/UserAvatarButton.tsx
@@ -2,7 +2,8 @@ import type { IUser } from '@rocket.chat/core-typings';
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Dropdown } from '@rocket.chat/fuselage';
 import { useUser } from '@rocket.chat/ui-contexts';
-import React, { memo, useRef, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { memo, useRef } from 'react';
 import { createPortal } from 'react-dom';
 
 import { UserStatus } from '../../components/UserStatus';
diff --git a/apps/meteor/client/sidebar/header/UserDropdown.tsx b/apps/meteor/client/sidebar/header/UserDropdown.tsx
index 72a01c59fa0..0a67885f16f 100644
--- a/apps/meteor/client/sidebar/header/UserDropdown.tsx
+++ b/apps/meteor/client/sidebar/header/UserDropdown.tsx
@@ -1,5 +1,5 @@
-import type { IUser } from '@rocket.chat/core-typings';
-import { UserStatus as UserStatusEnum, ValueOf } from '@rocket.chat/core-typings';
+import type { IUser, ValueOf } from '@rocket.chat/core-typings';
+import { UserStatus as UserStatusEnum } from '@rocket.chat/core-typings';
 import {
 	Box,
 	Margins,
@@ -13,7 +13,8 @@ import {
 } from '@rocket.chat/fuselage';
 import { useMutableCallback, useSessionStorage } from '@rocket.chat/fuselage-hooks';
 import { useLayout, useRoute, useLogout, useSetting, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { AccountBox } from '../../../app/ui-utils/client';
 import { userStatus } from '../../../app/user-status/client';
diff --git a/apps/meteor/client/sidebar/header/actions/Administration.tsx b/apps/meteor/client/sidebar/header/actions/Administration.tsx
index d0fbcd5fa12..4202021b265 100644
--- a/apps/meteor/client/sidebar/header/actions/Administration.tsx
+++ b/apps/meteor/client/sidebar/header/actions/Administration.tsx
@@ -1,7 +1,8 @@
 import { Sidebar, Dropdown } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useAtLeastOnePermission } from '@rocket.chat/ui-contexts';
-import React, { HTMLAttributes, useRef, VFC } from 'react';
+import type { HTMLAttributes, VFC } from 'react';
+import React, { useRef } from 'react';
 import { createPortal } from 'react-dom';
 
 import { AccountBox } from '../../../../app/ui-utils/client';
diff --git a/apps/meteor/client/sidebar/header/actions/CreateRoom.tsx b/apps/meteor/client/sidebar/header/actions/CreateRoom.tsx
index 4e828651132..2c9d4f5ed3e 100644
--- a/apps/meteor/client/sidebar/header/actions/CreateRoom.tsx
+++ b/apps/meteor/client/sidebar/header/actions/CreateRoom.tsx
@@ -1,6 +1,7 @@
 import { Sidebar, Dropdown } from '@rocket.chat/fuselage';
 import { useAtLeastOnePermission } from '@rocket.chat/ui-contexts';
-import React, { HTMLAttributes, useRef, VFC } from 'react';
+import type { HTMLAttributes, VFC } from 'react';
+import React, { useRef } from 'react';
 import { createPortal } from 'react-dom';
 
 import { useDropdownVisibility } from '../hooks/useDropdownVisibility';
diff --git a/apps/meteor/client/sidebar/header/actions/CreateRoomList.tsx b/apps/meteor/client/sidebar/header/actions/CreateRoomList.tsx
index b4ebe0c014e..7665fe999d4 100644
--- a/apps/meteor/client/sidebar/header/actions/CreateRoomList.tsx
+++ b/apps/meteor/client/sidebar/header/actions/CreateRoomList.tsx
@@ -1,6 +1,7 @@
 import { OptionTitle } from '@rocket.chat/fuselage';
 import { useSetting, useAtLeastOnePermission, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, MouseEvent } from 'react';
+import type { ReactElement, MouseEvent } from 'react';
+import React from 'react';
 
 import CreateDiscussion from '../../../components/CreateDiscussion';
 import ListItem from '../../../components/Sidebar/ListItem';
diff --git a/apps/meteor/client/sidebar/header/actions/Directory.tsx b/apps/meteor/client/sidebar/header/actions/Directory.tsx
index 3f556a4f559..76ae51042ac 100644
--- a/apps/meteor/client/sidebar/header/actions/Directory.tsx
+++ b/apps/meteor/client/sidebar/header/actions/Directory.tsx
@@ -1,7 +1,8 @@
 import { Sidebar } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useLayout, useRoute } from '@rocket.chat/ui-contexts';
-import React, { HTMLAttributes, VFC } from 'react';
+import type { HTMLAttributes, VFC } from 'react';
+import React from 'react';
 
 const Directory: VFC<Omit<HTMLAttributes<HTMLElement>, 'is'>> = (props) => {
 	const directoryRoute = useRoute('directory');
diff --git a/apps/meteor/client/sidebar/header/actions/Home.tsx b/apps/meteor/client/sidebar/header/actions/Home.tsx
index 5451f976336..9450bd4c12a 100644
--- a/apps/meteor/client/sidebar/header/actions/Home.tsx
+++ b/apps/meteor/client/sidebar/header/actions/Home.tsx
@@ -1,7 +1,8 @@
 import { Sidebar } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useLayout, useRoute, useSetting } from '@rocket.chat/ui-contexts';
-import React, { HTMLAttributes, VFC } from 'react';
+import type { HTMLAttributes, VFC } from 'react';
+import React from 'react';
 
 const SidebarHeaderActionHome: VFC<Omit<HTMLAttributes<HTMLElement>, 'is'>> = (props) => {
 	const homeRoute = useRoute('home');
diff --git a/apps/meteor/client/sidebar/header/actions/Login.tsx b/apps/meteor/client/sidebar/header/actions/Login.tsx
index a2014d392a9..e1c699cc1db 100644
--- a/apps/meteor/client/sidebar/header/actions/Login.tsx
+++ b/apps/meteor/client/sidebar/header/actions/Login.tsx
@@ -1,6 +1,7 @@
 import { Sidebar } from '@rocket.chat/fuselage';
 import { useSessionDispatch, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { HTMLAttributes, VFC } from 'react';
+import type { HTMLAttributes, VFC } from 'react';
+import React from 'react';
 
 const Login: VFC<Omit<HTMLAttributes<HTMLElement>, 'is'>> = (props) => {
 	const setForceLogin = useSessionDispatch('forceLogin');
diff --git a/apps/meteor/client/sidebar/header/actions/Search.tsx b/apps/meteor/client/sidebar/header/actions/Search.tsx
index 3460ef3f35a..40013375254 100644
--- a/apps/meteor/client/sidebar/header/actions/Search.tsx
+++ b/apps/meteor/client/sidebar/header/actions/Search.tsx
@@ -1,6 +1,7 @@
 import { Sidebar } from '@rocket.chat/fuselage';
 import { useMutableCallback, useOutsideClick } from '@rocket.chat/fuselage-hooks';
-import React, { useState, useEffect, useRef, VFC, HTMLAttributes } from 'react';
+import type { VFC, HTMLAttributes } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import tinykeys from 'tinykeys';
 
 import SearchList from '../../search/SearchList';
diff --git a/apps/meteor/client/sidebar/header/actions/Sort.tsx b/apps/meteor/client/sidebar/header/actions/Sort.tsx
index f586255e406..ac993807b23 100644
--- a/apps/meteor/client/sidebar/header/actions/Sort.tsx
+++ b/apps/meteor/client/sidebar/header/actions/Sort.tsx
@@ -1,5 +1,6 @@
 import { Sidebar, Dropdown } from '@rocket.chat/fuselage';
-import React, { VFC, useRef, HTMLAttributes } from 'react';
+import type { VFC, HTMLAttributes } from 'react';
+import React, { useRef } from 'react';
 import { createPortal } from 'react-dom';
 
 import SortList from '../../../components/SortList';
diff --git a/apps/meteor/client/sidebar/header/hooks/useCreateRoomModal.tsx b/apps/meteor/client/sidebar/header/hooks/useCreateRoomModal.tsx
index f941e479c8e..4ae0e995732 100644
--- a/apps/meteor/client/sidebar/header/hooks/useCreateRoomModal.tsx
+++ b/apps/meteor/client/sidebar/header/hooks/useCreateRoomModal.tsx
@@ -1,6 +1,7 @@
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useSetModal } from '@rocket.chat/ui-contexts';
-import React, { MouseEvent, FC } from 'react';
+import type { MouseEvent, FC } from 'react';
+import React from 'react';
 
 import { popover } from '../../../../app/ui-utils/client';
 
diff --git a/apps/meteor/client/sidebar/header/hooks/useDropdownVisibility.ts b/apps/meteor/client/sidebar/header/hooks/useDropdownVisibility.ts
index 3bec80d28ab..390486d1727 100644
--- a/apps/meteor/client/sidebar/header/hooks/useDropdownVisibility.ts
+++ b/apps/meteor/client/sidebar/header/hooks/useDropdownVisibility.ts
@@ -1,5 +1,6 @@
 import { useToggle, useOutsideClick } from '@rocket.chat/fuselage-hooks';
-import { RefObject, useCallback } from 'react';
+import type { RefObject } from 'react';
+import { useCallback } from 'react';
 
 /**
  * useDropdownVisibility
diff --git a/apps/meteor/client/sidebar/header/index.tsx b/apps/meteor/client/sidebar/header/index.tsx
index 36c8113b450..d6370a5d791 100644
--- a/apps/meteor/client/sidebar/header/index.tsx
+++ b/apps/meteor/client/sidebar/header/index.tsx
@@ -1,6 +1,7 @@
 import { Sidebar } from '@rocket.chat/fuselage';
 import { useUser, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { memo, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { memo } from 'react';
 
 import { useSidebarPaletteColor } from '../hooks/useSidebarPaletteColor';
 import UserAvatarButton from './UserAvatarButton';
diff --git a/apps/meteor/client/sidebar/hooks/useAvatarTemplate.tsx b/apps/meteor/client/sidebar/hooks/useAvatarTemplate.tsx
index 425c2081c81..5bb49da3741 100644
--- a/apps/meteor/client/sidebar/hooks/useAvatarTemplate.tsx
+++ b/apps/meteor/client/sidebar/hooks/useAvatarTemplate.tsx
@@ -1,6 +1,7 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { useUserPreference } from '@rocket.chat/ui-contexts';
-import React, { ComponentType, useMemo } from 'react';
+import type { ComponentType } from 'react';
+import React, { useMemo } from 'react';
 
 import RoomAvatar from '../../components/avatar/RoomAvatar';
 
diff --git a/apps/meteor/client/sidebar/hooks/usePreventDefault.ts b/apps/meteor/client/sidebar/hooks/usePreventDefault.ts
index 338d3a344b7..9d3ca18da35 100644
--- a/apps/meteor/client/sidebar/hooks/usePreventDefault.ts
+++ b/apps/meteor/client/sidebar/hooks/usePreventDefault.ts
@@ -1,4 +1,5 @@
-import { RefObject, useEffect } from 'react';
+import type { RefObject } from 'react';
+import { useEffect } from 'react';
 
 export const usePreventDefault = (ref: RefObject<Element>): { ref: RefObject<Element> } => {
 	// Flowrouter uses an addEventListener on the document to capture any clink link, since the react synthetic event use an addEventListener on the document too,
diff --git a/apps/meteor/client/sidebar/hooks/useShortcutOpenMenu.ts b/apps/meteor/client/sidebar/hooks/useShortcutOpenMenu.ts
index 5cc0532232c..9898e67040e 100644
--- a/apps/meteor/client/sidebar/hooks/useShortcutOpenMenu.ts
+++ b/apps/meteor/client/sidebar/hooks/useShortcutOpenMenu.ts
@@ -1,4 +1,5 @@
-import { RefObject, useEffect } from 'react';
+import type { RefObject } from 'react';
+import { useEffect } from 'react';
 import tinykeys from 'tinykeys';
 
 // used to open the menu option by keyboard
diff --git a/apps/meteor/client/sidebar/hooks/useTemplateByViewMode.tsx b/apps/meteor/client/sidebar/hooks/useTemplateByViewMode.tsx
index 6d2c2899c0c..2362669f3eb 100644
--- a/apps/meteor/client/sidebar/hooks/useTemplateByViewMode.tsx
+++ b/apps/meteor/client/sidebar/hooks/useTemplateByViewMode.tsx
@@ -1,5 +1,6 @@
 import { useUserPreference } from '@rocket.chat/ui-contexts';
-import { ComponentType, useMemo } from 'react';
+import type { ComponentType } from 'react';
+import { useMemo } from 'react';
 
 import Condensed from '../Item/Condensed';
 import Extended from '../Item/Extended';
diff --git a/apps/meteor/client/sidebar/search/Row.tsx b/apps/meteor/client/sidebar/search/Row.tsx
index 475eae9e2a4..68ceecd2ad8 100644
--- a/apps/meteor/client/sidebar/search/Row.tsx
+++ b/apps/meteor/client/sidebar/search/Row.tsx
@@ -1,5 +1,6 @@
-import { IRoom, ISubscription } from '@rocket.chat/core-typings';
-import React, { memo, ReactElement } from 'react';
+import type { IRoom, ISubscription } from '@rocket.chat/core-typings';
+import type { ReactElement } from 'react';
+import React, { memo } from 'react';
 
 import SideBarItemTemplateWithData from '../RoomList/SideBarItemTemplateWithData';
 import UserItem from './UserItem';
diff --git a/apps/meteor/client/sidebar/search/ScrollerWithCustomProps.tsx b/apps/meteor/client/sidebar/search/ScrollerWithCustomProps.tsx
index 076f838e3b2..176eed7c4f1 100644
--- a/apps/meteor/client/sidebar/search/ScrollerWithCustomProps.tsx
+++ b/apps/meteor/client/sidebar/search/ScrollerWithCustomProps.tsx
@@ -1,4 +1,5 @@
-import React, { forwardRef, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { forwardRef } from 'react';
 
 import ScrollableContentWrapper from '../../components/ScrollableContentWrapper';
 
diff --git a/apps/meteor/client/sidebar/search/SearchList.tsx b/apps/meteor/client/sidebar/search/SearchList.tsx
index 32868b48cb0..63fd6ce4ce0 100644
--- a/apps/meteor/client/sidebar/search/SearchList.tsx
+++ b/apps/meteor/client/sidebar/search/SearchList.tsx
@@ -1,4 +1,4 @@
-import { IRoom, ISubscription, RoomType } from '@rocket.chat/core-typings';
+import type { IRoom, ISubscription, RoomType } from '@rocket.chat/core-typings';
 import { css } from '@rocket.chat/css-in-js';
 import { Sidebar, TextInput, Box, Icon } from '@rocket.chat/fuselage';
 import {
@@ -11,23 +11,13 @@ import {
 } from '@rocket.chat/fuselage-hooks';
 import { escapeRegExp } from '@rocket.chat/string-helpers';
 import { useUserPreference, useUserSubscriptions, useSetting, useTranslation, useMethod } from '@rocket.chat/ui-contexts';
-import { useQuery, UseQueryResult } from '@tanstack/react-query';
+import type { UseQueryResult } from '@tanstack/react-query';
+import { useQuery } from '@tanstack/react-query';
 import { Meteor } from 'meteor/meteor';
-import React, {
-	forwardRef,
-	useState,
-	useMemo,
-	useEffect,
-	useRef,
-	ReactElement,
-	MutableRefObject,
-	SetStateAction,
-	Dispatch,
-	FormEventHandler,
-	Ref,
-	MouseEventHandler,
-} from 'react';
-import { Virtuoso, VirtuosoHandle } from 'react-virtuoso';
+import type { ReactElement, MutableRefObject, SetStateAction, Dispatch, FormEventHandler, Ref, MouseEventHandler } from 'react';
+import React, { forwardRef, useState, useMemo, useEffect, useRef } from 'react';
+import type { VirtuosoHandle } from 'react-virtuoso';
+import { Virtuoso } from 'react-virtuoso';
 import tinykeys from 'tinykeys';
 
 import { useAvatarTemplate } from '../hooks/useAvatarTemplate';
diff --git a/apps/meteor/client/sidebar/search/UserItem.tsx b/apps/meteor/client/sidebar/search/UserItem.tsx
index 21840bcc414..feb8f574576 100644
--- a/apps/meteor/client/sidebar/search/UserItem.tsx
+++ b/apps/meteor/client/sidebar/search/UserItem.tsx
@@ -1,6 +1,7 @@
-import { IUser } from '@rocket.chat/core-typings';
+import type { IUser } from '@rocket.chat/core-typings';
 import { Sidebar } from '@rocket.chat/fuselage';
-import React, { memo, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { memo } from 'react';
 
 import { ReactiveUserStatus } from '../../components/UserStatus';
 import { roomCoordinator } from '../../lib/rooms/roomCoordinator';
diff --git a/apps/meteor/client/sidebar/sections/OmnichannelSection.tsx b/apps/meteor/client/sidebar/sections/OmnichannelSection.tsx
index 15d17047bd9..542fa05c54a 100644
--- a/apps/meteor/client/sidebar/sections/OmnichannelSection.tsx
+++ b/apps/meteor/client/sidebar/sections/OmnichannelSection.tsx
@@ -1,7 +1,9 @@
-import { Box, Sidebar } from '@rocket.chat/fuselage';
+import type { Box } from '@rocket.chat/fuselage';
+import { Sidebar } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useLayout, useRoute, usePermission, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { memo, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { memo } from 'react';
 
 import { useIsCallEnabled, useIsCallReady } from '../../contexts/CallContext';
 import { useOmnichannelShowQueueLink } from '../../hooks/omnichannel/useOmnichannelShowQueueLink';
diff --git a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallDialPad.tsx b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallDialPad.tsx
index 9d0c4f6512c..f0755e12558 100644
--- a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallDialPad.tsx
+++ b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallDialPad.tsx
@@ -1,6 +1,7 @@
 import { Sidebar } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { useVoipOutboundStates } from '../../../contexts/CallContext';
 import { useDialModal } from '../../../hooks/useDialModal';
diff --git a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggle.tsx b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggle.tsx
index 13d7a77b160..701286fc966 100644
--- a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggle.tsx
+++ b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggle.tsx
@@ -1,4 +1,5 @@
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { useIsCallReady, useIsCallError } from '../../../contexts/CallContext';
 import { OmnichannelCallToggleError } from './OmnichannelCallToggleError';
diff --git a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleError.tsx b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleError.tsx
index 6357e2a6fb6..77efcd5057e 100644
--- a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleError.tsx
+++ b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleError.tsx
@@ -1,6 +1,7 @@
 import { Sidebar } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 export const OmnichannelCallToggleError = ({ ...props }): ReactElement => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleLoading.tsx b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleLoading.tsx
index 04ea607e650..673a3225482 100644
--- a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleLoading.tsx
+++ b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleLoading.tsx
@@ -1,6 +1,7 @@
 import { Sidebar } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 export const OmnichannelCallToggleLoading = ({ ...props }): ReactElement => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleReady.tsx b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleReady.tsx
index 7ed412cfc33..0411c082f4d 100644
--- a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleReady.tsx
+++ b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggleReady.tsx
@@ -1,6 +1,7 @@
 import { Sidebar } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useCallback } from 'react';
+import type { ReactElement } from 'react';
+import React, { useCallback } from 'react';
 
 import { useCallerInfo, useCallRegisterClient, useCallUnregisterClient, useVoipNetworkStatus } from '../../../contexts/CallContext';
 
diff --git a/apps/meteor/client/sidebar/sections/actions/OmnichannelLivechatToggle.tsx b/apps/meteor/client/sidebar/sections/actions/OmnichannelLivechatToggle.tsx
index e0417ef2d47..e63fe468a69 100644
--- a/apps/meteor/client/sidebar/sections/actions/OmnichannelLivechatToggle.tsx
+++ b/apps/meteor/client/sidebar/sections/actions/OmnichannelLivechatToggle.tsx
@@ -1,7 +1,8 @@
 import { Sidebar } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useEndpoint, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { useOmnichannelAgentAvailable } from '../../../hooks/omnichannel/useOmnichannelAgentAvailable';
 
diff --git a/apps/meteor/client/sidebar/sections/actions/index.ts b/apps/meteor/client/sidebar/sections/actions/index.ts
index d74426b43c6..b686bfd16fb 100644
--- a/apps/meteor/client/sidebar/sections/actions/index.ts
+++ b/apps/meteor/client/sidebar/sections/actions/index.ts
@@ -1,6 +1,5 @@
 export * from './OmnichannelCallDialPad';
 export * from './OmnichannelCallToggle';
 export * from './OmnichannelCallToggleError';
-export * from './OmnichannelCallToggleError';
 export * from './OmnichannelCallToggleReady';
 export * from './OmnichannelLivechatToggle';
diff --git a/apps/meteor/client/startup/contextualBar/exportMessages.ts b/apps/meteor/client/startup/contextualBar/exportMessages.ts
index 8422f7b482c..2d189d5493b 100644
--- a/apps/meteor/client/startup/contextualBar/exportMessages.ts
+++ b/apps/meteor/client/startup/contextualBar/exportMessages.ts
@@ -1,5 +1,6 @@
 import { usePermission } from '@rocket.chat/ui-contexts';
-import { useMemo, lazy, LazyExoticComponent, FC } from 'react';
+import type { LazyExoticComponent, FC } from 'react';
+import { useMemo, lazy } from 'react';
 
 import { addAction } from '../../views/room/lib/Toolbox';
 
diff --git a/apps/meteor/client/startup/enterRoom/readMessages.ts b/apps/meteor/client/startup/enterRoom/readMessages.ts
index 109934759c8..1fecae70dae 100644
--- a/apps/meteor/client/startup/enterRoom/readMessages.ts
+++ b/apps/meteor/client/startup/enterRoom/readMessages.ts
@@ -1,4 +1,4 @@
-import { ISubscription } from '@rocket.chat/core-typings';
+import type { ISubscription } from '@rocket.chat/core-typings';
 
 import { readMessage } from '../../../app/ui-utils/client';
 import { callbacks } from '../../../lib/callbacks';
diff --git a/apps/meteor/client/startup/incomingMessages.ts b/apps/meteor/client/startup/incomingMessages.ts
index 8f39c8acd03..a84921529e4 100644
--- a/apps/meteor/client/startup/incomingMessages.ts
+++ b/apps/meteor/client/startup/incomingMessages.ts
@@ -1,4 +1,4 @@
-import { IMessage, ISubscription } from '@rocket.chat/core-typings';
+import type { IMessage, ISubscription } from '@rocket.chat/core-typings';
 import { Meteor } from 'meteor/meteor';
 
 import { ChatMessage } from '../../app/models/client';
diff --git a/apps/meteor/client/startup/loadMissedMessages.ts b/apps/meteor/client/startup/loadMissedMessages.ts
index 93777ff4d54..1b4faf415bd 100644
--- a/apps/meteor/client/startup/loadMissedMessages.ts
+++ b/apps/meteor/client/startup/loadMissedMessages.ts
@@ -1,4 +1,4 @@
-import { IRoom } from '@rocket.chat/core-typings';
+import type { IRoom } from '@rocket.chat/core-typings';
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 
diff --git a/apps/meteor/client/startup/mergeSubscriptionsAndRooms.ts b/apps/meteor/client/startup/mergeSubscriptionsAndRooms.ts
index 4d1283e3758..0130e659a07 100644
--- a/apps/meteor/client/startup/mergeSubscriptionsAndRooms.ts
+++ b/apps/meteor/client/startup/mergeSubscriptionsAndRooms.ts
@@ -1,9 +1,9 @@
-import { IOmnichannelRoom, IRoom, IRoomWithRetentionPolicy, ISubscription } from '@rocket.chat/core-typings';
-import { Mongo } from 'meteor/mongo';
+import type { IOmnichannelRoom, IRoom, IRoomWithRetentionPolicy, ISubscription } from '@rocket.chat/core-typings';
+import type { Mongo } from 'meteor/mongo';
 
 import { Rooms, Subscriptions } from '../../app/models/client';
 import { callbacks } from '../../lib/callbacks';
-import { SubscriptionWithRoom } from '../definitions/SubscriptionWithRoom';
+import type { SubscriptionWithRoom } from '../definitions/SubscriptionWithRoom';
 
 const getLowerCaseNames = (
 	room: Pick<IRoom, 'name' | 'fname' | 'prid'>,
diff --git a/apps/meteor/client/startup/otr.ts b/apps/meteor/client/startup/otr.ts
index e63b76275d5..eaf3d9bb872 100644
--- a/apps/meteor/client/startup/otr.ts
+++ b/apps/meteor/client/startup/otr.ts
@@ -1,4 +1,4 @@
-import { IMessage, IRoom, IUser, AtLeast } from '@rocket.chat/core-typings';
+import type { IMessage, IRoom, IUser, AtLeast } from '@rocket.chat/core-typings';
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 
diff --git a/apps/meteor/client/startup/startup.ts b/apps/meteor/client/startup/startup.ts
index fa9f728d124..f766f298eb6 100644
--- a/apps/meteor/client/startup/startup.ts
+++ b/apps/meteor/client/startup/startup.ts
@@ -1,4 +1,4 @@
-import { UserStatus } from '@rocket.chat/core-typings';
+import type { UserStatus } from '@rocket.chat/core-typings';
 import { Accounts } from 'meteor/accounts-base';
 import { UserPresence } from 'meteor/konecty:user-presence';
 import { Meteor } from 'meteor/meteor';
diff --git a/apps/meteor/client/startup/userStatusManuallySet.ts b/apps/meteor/client/startup/userStatusManuallySet.ts
index b1c56dff115..5d46cf8b002 100644
--- a/apps/meteor/client/startup/userStatusManuallySet.ts
+++ b/apps/meteor/client/startup/userStatusManuallySet.ts
@@ -1,4 +1,4 @@
-import { UserStatus } from '@rocket.chat/core-typings';
+import type { UserStatus } from '@rocket.chat/core-typings';
 import { Meteor } from 'meteor/meteor';
 
 import { callbacks } from '../../lib/callbacks';
diff --git a/apps/meteor/client/stories/contexts/ModalContextMock.tsx b/apps/meteor/client/stories/contexts/ModalContextMock.tsx
index cca7c117560..ac1d303b231 100644
--- a/apps/meteor/client/stories/contexts/ModalContextMock.tsx
+++ b/apps/meteor/client/stories/contexts/ModalContextMock.tsx
@@ -1,6 +1,7 @@
 import { ModalContext } from '@rocket.chat/ui-contexts';
 import { action } from '@storybook/addon-actions';
-import React, { ContextType, ReactElement, ReactNode, useContext, useMemo } from 'react';
+import type { ContextType, ReactElement, ReactNode } from 'react';
+import React, { useContext, useMemo } from 'react';
 
 const logAction = action('ModalContext');
 
diff --git a/apps/meteor/client/stories/contexts/QueryClientProviderMock.tsx b/apps/meteor/client/stories/contexts/QueryClientProviderMock.tsx
index fcec4a49c16..57caa2cc242 100644
--- a/apps/meteor/client/stories/contexts/QueryClientProviderMock.tsx
+++ b/apps/meteor/client/stories/contexts/QueryClientProviderMock.tsx
@@ -1,5 +1,6 @@
 import { QueryCache, QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 const queryCache = new QueryCache();
 
diff --git a/apps/meteor/client/stories/contexts/RouterContextMock.tsx b/apps/meteor/client/stories/contexts/RouterContextMock.tsx
index 3da1b7cb407..1d97ddc73eb 100644
--- a/apps/meteor/client/stories/contexts/RouterContextMock.tsx
+++ b/apps/meteor/client/stories/contexts/RouterContextMock.tsx
@@ -1,6 +1,7 @@
 import { RouterContext } from '@rocket.chat/ui-contexts';
 import { action } from '@storybook/addon-actions';
-import React, { ContextType, ReactElement, ReactNode, useContext, useMemo } from 'react';
+import type { ContextType, ReactElement, ReactNode } from 'react';
+import React, { useContext, useMemo } from 'react';
 
 const logAction = action('RouterContext');
 
diff --git a/apps/meteor/client/stories/contexts/ServerContextMock.tsx b/apps/meteor/client/stories/contexts/ServerContextMock.tsx
index 1e8c1dc7a65..8a4d3724a77 100644
--- a/apps/meteor/client/stories/contexts/ServerContextMock.tsx
+++ b/apps/meteor/client/stories/contexts/ServerContextMock.tsx
@@ -1,9 +1,11 @@
-import { Serialized } from '@rocket.chat/core-typings';
+import type { Serialized } from '@rocket.chat/core-typings';
 import type { MatchPathPattern, Method, OperationParams, OperationResult, Path, PathFor } from '@rocket.chat/rest-typings';
-import { ServerContext, ServerMethodName, ServerMethodParameters, ServerMethodReturn, UploadResult } from '@rocket.chat/ui-contexts';
+import type { ServerMethodName, ServerMethodParameters, ServerMethodReturn, UploadResult } from '@rocket.chat/ui-contexts';
+import { ServerContext } from '@rocket.chat/ui-contexts';
 import { action } from '@storybook/addon-actions';
 import { pathToRegexp } from 'path-to-regexp';
-import React, { ContextType, ReactElement, ReactNode, useContext, useMemo } from 'react';
+import type { ContextType, ReactElement, ReactNode } from 'react';
+import React, { useContext, useMemo } from 'react';
 
 const logAction = action('ServerContext');
 
diff --git a/apps/meteor/client/stories/contexts/TranslationContextMock.tsx b/apps/meteor/client/stories/contexts/TranslationContextMock.tsx
index 059f3147dba..7b8e8548094 100644
--- a/apps/meteor/client/stories/contexts/TranslationContextMock.tsx
+++ b/apps/meteor/client/stories/contexts/TranslationContextMock.tsx
@@ -1,6 +1,8 @@
-import { TranslationContext, TranslationKey } from '@rocket.chat/ui-contexts';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { TranslationContext } from '@rocket.chat/ui-contexts';
 import i18next from 'i18next';
-import React, { ContextType, ReactElement, ReactNode, useContext, useMemo } from 'react';
+import type { ContextType, ReactElement, ReactNode } from 'react';
+import React, { useContext, useMemo } from 'react';
 
 type TranslationContextMockProps = {
 	children: ReactNode;
diff --git a/apps/meteor/client/templates.ts b/apps/meteor/client/templates.ts
index e17e66e94db..278ff547a72 100644
--- a/apps/meteor/client/templates.ts
+++ b/apps/meteor/client/templates.ts
@@ -24,7 +24,7 @@ createTemplateForComponent('BroadCastMetric', () => import('./components/message
 
 createTemplateForComponent(
 	'Checkbox',
-	async (): Promise<{ default: typeof import('@rocket.chat/fuselage').CheckBox }> => {
+	async (): Promise<{ default: typeof CheckBox }> => {
 		const { CheckBox } = await import('@rocket.chat/fuselage');
 		return { default: CheckBox };
 	},
diff --git a/apps/meteor/client/views/account/AccountRouter.tsx b/apps/meteor/client/views/account/AccountRouter.tsx
index 43a5c13c6ed..8e5f3c008a2 100644
--- a/apps/meteor/client/views/account/AccountRouter.tsx
+++ b/apps/meteor/client/views/account/AccountRouter.tsx
@@ -1,5 +1,6 @@
 import { useCurrentRoute, useRoute } from '@rocket.chat/ui-contexts';
-import React, { Suspense, ReactElement, useEffect, ReactNode } from 'react';
+import type { ReactElement, ReactNode } from 'react';
+import React, { Suspense, useEffect } from 'react';
 
 import { SideNav } from '../../../app/ui-utils/client';
 import PageSkeleton from '../../components/PageSkeleton';
diff --git a/apps/meteor/client/views/account/AccountSidebar.tsx b/apps/meteor/client/views/account/AccountSidebar.tsx
index 37662e5e8b8..9953bd04704 100644
--- a/apps/meteor/client/views/account/AccountSidebar.tsx
+++ b/apps/meteor/client/views/account/AccountSidebar.tsx
@@ -1,5 +1,6 @@
 import { useRoutePath, useCurrentRoute, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { memo, ReactElement, useCallback, useEffect } from 'react';
+import type { ReactElement } from 'react';
+import React, { memo, useCallback, useEffect } from 'react';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
 
 import { menu, SideNav } from '../../../app/ui-utils/client';
diff --git a/apps/meteor/client/views/account/integrations/AccountIntegrationsPage.tsx b/apps/meteor/client/views/account/integrations/AccountIntegrationsPage.tsx
index cbe7ac13331..2a149e4732b 100644
--- a/apps/meteor/client/views/account/integrations/AccountIntegrationsPage.tsx
+++ b/apps/meteor/client/views/account/integrations/AccountIntegrationsPage.tsx
@@ -1,8 +1,10 @@
 import type { IWebdavAccountIntegration } from '@rocket.chat/core-typings';
-import { Box, Select, SelectOption, Field, Button } from '@rocket.chat/fuselage';
+import type { SelectOption } from '@rocket.chat/fuselage';
+import { Box, Select, Field, Button } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useEndpoint, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useMemo, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo } from 'react';
 import { useForm, Controller } from 'react-hook-form';
 
 import { WebdavAccounts } from '../../../../app/models/client';
diff --git a/apps/meteor/client/views/account/integrations/AccountIntegrationsRoute.tsx b/apps/meteor/client/views/account/integrations/AccountIntegrationsRoute.tsx
index dc70fb73888..ba16360b3d3 100644
--- a/apps/meteor/client/views/account/integrations/AccountIntegrationsRoute.tsx
+++ b/apps/meteor/client/views/account/integrations/AccountIntegrationsRoute.tsx
@@ -1,5 +1,6 @@
 import { useSetting } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 import AccountIntegrationsPage from './AccountIntegrationsPage';
diff --git a/apps/meteor/client/views/account/preferences/AccountPreferencesPage.tsx b/apps/meteor/client/views/account/preferences/AccountPreferencesPage.tsx
index 325dc68a01d..b4228b1f86b 100644
--- a/apps/meteor/client/views/account/preferences/AccountPreferencesPage.tsx
+++ b/apps/meteor/client/views/account/preferences/AccountPreferencesPage.tsx
@@ -1,6 +1,7 @@
 import { ButtonGroup, Button, Box, Accordion } from '@rocket.chat/fuselage';
 import { useToastMessageDispatch, useSetting, useTranslation, useEndpoint } from '@rocket.chat/ui-contexts';
-import React, { MutableRefObject, ReactElement, useState, useCallback, useRef } from 'react';
+import type { MutableRefObject, ReactElement } from 'react';
+import React, { useState, useCallback, useRef } from 'react';
 
 import Page from '../../../components/Page';
 import PreferencesGlobalSection from './PreferencesGlobalSection';
diff --git a/apps/meteor/client/views/account/preferences/MyDataModal.tsx b/apps/meteor/client/views/account/preferences/MyDataModal.tsx
index 565012ec428..f3b30171adb 100644
--- a/apps/meteor/client/views/account/preferences/MyDataModal.tsx
+++ b/apps/meteor/client/views/account/preferences/MyDataModal.tsx
@@ -1,6 +1,7 @@
 import { Button, Box, Modal } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, ReactNode } from 'react';
+import type { FC, ReactNode } from 'react';
+import React from 'react';
 
 type MyDataModalProps = {
 	onCancel: () => void;
diff --git a/apps/meteor/client/views/account/preferences/PreferencesGlobalSection.tsx b/apps/meteor/client/views/account/preferences/PreferencesGlobalSection.tsx
index 344ebdef64e..b53249b40a9 100644
--- a/apps/meteor/client/views/account/preferences/PreferencesGlobalSection.tsx
+++ b/apps/meteor/client/views/account/preferences/PreferencesGlobalSection.tsx
@@ -1,9 +1,11 @@
-import { Accordion, Field, FieldGroup, MultiSelect, ToggleSwitch, Callout, SelectOption } from '@rocket.chat/fuselage';
+import type { SelectOption } from '@rocket.chat/fuselage';
+import { Accordion, Field, FieldGroup, MultiSelect, ToggleSwitch, Callout } from '@rocket.chat/fuselage';
 import { useUserPreference, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useMemo } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo } from 'react';
 
 import { useForm } from '../../../hooks/useForm';
-import { FormSectionProps } from './AccountPreferencesPage';
+import type { FormSectionProps } from './AccountPreferencesPage';
 
 const PreferencesGlobalSection = ({ onChange, commitRef, ...props }: FormSectionProps): ReactElement => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/account/preferences/PreferencesHighlightsSection.tsx b/apps/meteor/client/views/account/preferences/PreferencesHighlightsSection.tsx
index 30ee0b44e99..9179446df4d 100644
--- a/apps/meteor/client/views/account/preferences/PreferencesHighlightsSection.tsx
+++ b/apps/meteor/client/views/account/preferences/PreferencesHighlightsSection.tsx
@@ -1,9 +1,10 @@
 import { Accordion, Field, FieldGroup, TextAreaInput } from '@rocket.chat/fuselage';
 import { useUserPreference, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { useForm } from '../../../hooks/useForm';
-import { FormSectionProps } from './AccountPreferencesPage';
+import type { FormSectionProps } from './AccountPreferencesPage';
 
 const PreferencesHighlightsSection = ({ onChange, commitRef, ...props }: FormSectionProps): ReactElement => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/account/preferences/PreferencesLocalizationSection.tsx b/apps/meteor/client/views/account/preferences/PreferencesLocalizationSection.tsx
index e3d2b27bd71..c48ffdc0e95 100644
--- a/apps/meteor/client/views/account/preferences/PreferencesLocalizationSection.tsx
+++ b/apps/meteor/client/views/account/preferences/PreferencesLocalizationSection.tsx
@@ -1,6 +1,8 @@
-import { Accordion, Field, Select, FieldGroup, SelectOption } from '@rocket.chat/fuselage';
+import type { SelectOption } from '@rocket.chat/fuselage';
+import { Accordion, Field, Select, FieldGroup } from '@rocket.chat/fuselage';
 import { useUserPreference, useLanguages, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useEffect, useMemo } from 'react';
+import type { ReactElement } from 'react';
+import React, { useEffect, useMemo } from 'react';
 
 import { useForm } from '../../../hooks/useForm';
 import type { FormSectionProps } from './AccountPreferencesPage';
diff --git a/apps/meteor/client/views/account/preferences/PreferencesMessagesSection.tsx b/apps/meteor/client/views/account/preferences/PreferencesMessagesSection.tsx
index c7f70d353b6..4d7358bba32 100644
--- a/apps/meteor/client/views/account/preferences/PreferencesMessagesSection.tsx
+++ b/apps/meteor/client/views/account/preferences/PreferencesMessagesSection.tsx
@@ -1,6 +1,8 @@
-import { Accordion, Field, Select, FieldGroup, ToggleSwitch, SelectOption } from '@rocket.chat/fuselage';
+import type { SelectOption } from '@rocket.chat/fuselage';
+import { Accordion, Field, Select, FieldGroup, ToggleSwitch } from '@rocket.chat/fuselage';
 import { useUserPreference, useSetting, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useMemo } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo } from 'react';
 
 import { useForm } from '../../../hooks/useForm';
 import type { FormSectionProps } from './AccountPreferencesPage';
diff --git a/apps/meteor/client/views/account/preferences/PreferencesMyDataSection.tsx b/apps/meteor/client/views/account/preferences/PreferencesMyDataSection.tsx
index 5b2bb45ac68..2e3c3678e0f 100644
--- a/apps/meteor/client/views/account/preferences/PreferencesMyDataSection.tsx
+++ b/apps/meteor/client/views/account/preferences/PreferencesMyDataSection.tsx
@@ -1,6 +1,7 @@
 import { Accordion, Field, FieldGroup, ButtonGroup, Button, Icon, Box } from '@rocket.chat/fuselage';
 import { useSetModal, useToastMessageDispatch, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useCallback } from 'react';
+import type { ReactElement } from 'react';
+import React, { useCallback } from 'react';
 
 import MyDataModal from './MyDataModal';
 
diff --git a/apps/meteor/client/views/account/preferences/PreferencesNotificationsSection.tsx b/apps/meteor/client/views/account/preferences/PreferencesNotificationsSection.tsx
index 3d0f90f6d33..472d929c4f4 100644
--- a/apps/meteor/client/views/account/preferences/PreferencesNotificationsSection.tsx
+++ b/apps/meteor/client/views/account/preferences/PreferencesNotificationsSection.tsx
@@ -1,6 +1,9 @@
-import { Accordion, Field, Select, FieldGroup, ToggleSwitch, Button, Box, SelectOption } from '@rocket.chat/fuselage';
-import { useUserPreference, useSetting, useTranslation, TranslationKey } from '@rocket.chat/ui-contexts';
-import React, { useCallback, useEffect, useState, useMemo, ReactElement } from 'react';
+import type { SelectOption } from '@rocket.chat/fuselage';
+import { Accordion, Field, Select, FieldGroup, ToggleSwitch, Button, Box } from '@rocket.chat/fuselage';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useUserPreference, useSetting, useTranslation } from '@rocket.chat/ui-contexts';
+import type { ReactElement } from 'react';
+import React, { useCallback, useEffect, useState, useMemo } from 'react';
 
 import { KonchatNotification } from '../../../../app/ui/client';
 import { useForm } from '../../../hooks/useForm';
diff --git a/apps/meteor/client/views/account/preferences/PreferencesSoundSection.tsx b/apps/meteor/client/views/account/preferences/PreferencesSoundSection.tsx
index 11a734fb73e..1d44bcf0633 100644
--- a/apps/meteor/client/views/account/preferences/PreferencesSoundSection.tsx
+++ b/apps/meteor/client/views/account/preferences/PreferencesSoundSection.tsx
@@ -1,10 +1,12 @@
-import { Accordion, Field, Select, FieldGroup, ToggleSwitch, Tooltip, Box, SelectOption } from '@rocket.chat/fuselage';
+import type { SelectOption } from '@rocket.chat/fuselage';
+import { Accordion, Field, Select, FieldGroup, ToggleSwitch, Tooltip, Box } from '@rocket.chat/fuselage';
 import { useUserPreference, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useMemo, useCallback, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo, useCallback } from 'react';
 
 import { CustomSounds } from '../../../../app/custom-sounds/client';
 import { useForm } from '../../../hooks/useForm';
-import { FormSectionProps } from './AccountPreferencesPage';
+import type { FormSectionProps } from './AccountPreferencesPage';
 
 type Values = {
 	newRoomNotification: string;
diff --git a/apps/meteor/client/views/account/preferences/PreferencesUserPresenceSection.tsx b/apps/meteor/client/views/account/preferences/PreferencesUserPresenceSection.tsx
index 03a6b636d74..a3c73519bb7 100644
--- a/apps/meteor/client/views/account/preferences/PreferencesUserPresenceSection.tsx
+++ b/apps/meteor/client/views/account/preferences/PreferencesUserPresenceSection.tsx
@@ -1,6 +1,7 @@
 import { Accordion, Field, NumberInput, FieldGroup, ToggleSwitch } from '@rocket.chat/fuselage';
 import { useUserPreference, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useCallback } from 'react';
+import type { ReactElement } from 'react';
+import React, { useCallback } from 'react';
 
 import { useForm } from '../../../hooks/useForm';
 import type { FormSectionProps } from './AccountPreferencesPage';
diff --git a/apps/meteor/client/views/account/profile/AccountProfileForm.tsx b/apps/meteor/client/views/account/profile/AccountProfileForm.tsx
index 1a4a02b13c5..2192b601105 100644
--- a/apps/meteor/client/views/account/profile/AccountProfileForm.tsx
+++ b/apps/meteor/client/views/account/profile/AccountProfileForm.tsx
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
-import { IUser } from '@rocket.chat/core-typings';
+import type { IUser } from '@rocket.chat/core-typings';
 import {
 	Field,
 	FieldGroup,
@@ -14,8 +14,10 @@ import {
 	Margins,
 } from '@rocket.chat/fuselage';
 import { useDebouncedCallback, useSafely } from '@rocket.chat/fuselage-hooks';
-import { useToastMessageDispatch, useTranslation, TranslationKey, useEndpoint } from '@rocket.chat/ui-contexts';
-import React, { Dispatch, ReactElement, SetStateAction, useCallback, useMemo, useEffect, useState } from 'react';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useToastMessageDispatch, useTranslation, useEndpoint } from '@rocket.chat/ui-contexts';
+import type { Dispatch, ReactElement, SetStateAction } from 'react';
+import React, { useCallback, useMemo, useEffect, useState } from 'react';
 
 import { validateEmail } from '../../../../lib/emailValidator';
 import { getUserEmailAddress } from '../../../../lib/getUserEmailAddress';
@@ -23,7 +25,7 @@ import CustomFieldsForm from '../../../components/CustomFieldsForm';
 import UserStatusMenu from '../../../components/UserStatusMenu';
 import UserAvatarEditor from '../../../components/avatar/UserAvatarEditor';
 import { USER_STATUS_TEXT_MAX_LENGTH, BIO_TEXT_MAX_LENGTH } from '../../../lib/constants';
-import { AccountFormValues } from './AccountProfilePage';
+import type { AccountFormValues } from './AccountProfilePage';
 
 type AccountProfileFormProps = {
 	values: Record<string, unknown>;
diff --git a/apps/meteor/client/views/account/profile/AccountProfilePage.tsx b/apps/meteor/client/views/account/profile/AccountProfilePage.tsx
index ef016a01d61..031b9b41958 100644
--- a/apps/meteor/client/views/account/profile/AccountProfilePage.tsx
+++ b/apps/meteor/client/views/account/profile/AccountProfilePage.tsx
@@ -1,5 +1,6 @@
-import { AvatarObject, IUser } from '@rocket.chat/core-typings';
+import type { AvatarObject, IUser } from '@rocket.chat/core-typings';
 import { ButtonGroup, Button, Box, Icon } from '@rocket.chat/fuselage';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import {
 	useSetModal,
 	useToastMessageDispatch,
@@ -9,10 +10,10 @@ import {
 	useEndpoint,
 	useMethod,
 	useTranslation,
-	TranslationKey,
 } from '@rocket.chat/ui-contexts';
 import { SHA256 } from 'meteor/sha';
-import React, { ReactElement, useMemo, useState, useCallback } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo, useState, useCallback } from 'react';
 
 import { getUserEmailAddress } from '../../../../lib/getUserEmailAddress';
 import ConfirmOwnerChangeModal from '../../../components/ConfirmOwnerChangeModal';
diff --git a/apps/meteor/client/views/account/profile/AccountProfileRoute.tsx b/apps/meteor/client/views/account/profile/AccountProfileRoute.tsx
index 4f8b25b9adb..52d879c3053 100644
--- a/apps/meteor/client/views/account/profile/AccountProfileRoute.tsx
+++ b/apps/meteor/client/views/account/profile/AccountProfileRoute.tsx
@@ -1,5 +1,6 @@
 import { useSetting } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 import AccountProfilePage from './AccountProfilePage';
diff --git a/apps/meteor/client/views/account/profile/ActionConfirmModal.tsx b/apps/meteor/client/views/account/profile/ActionConfirmModal.tsx
index 126aa290151..f3179952541 100644
--- a/apps/meteor/client/views/account/profile/ActionConfirmModal.tsx
+++ b/apps/meteor/client/views/account/profile/ActionConfirmModal.tsx
@@ -1,6 +1,7 @@
 import { Box, PasswordInput, TextInput, FieldGroup, Field } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useState, useCallback, FC } from 'react';
+import type { FC } from 'react';
+import React, { useState, useCallback } from 'react';
 
 import GenericModal from '../../../components/GenericModal';
 
diff --git a/apps/meteor/client/views/account/security/AccountSecurityPage.tsx b/apps/meteor/client/views/account/security/AccountSecurityPage.tsx
index 42a947d6386..e6017b943d7 100644
--- a/apps/meteor/client/views/account/security/AccountSecurityPage.tsx
+++ b/apps/meteor/client/views/account/security/AccountSecurityPage.tsx
@@ -1,6 +1,7 @@
 import { Box, Accordion } from '@rocket.chat/fuselage';
 import { useSetting, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import Page from '../../../components/Page';
 import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
diff --git a/apps/meteor/client/views/account/security/AccountSecurityRoute.tsx b/apps/meteor/client/views/account/security/AccountSecurityRoute.tsx
index 41da07aa5f3..10f9945cd7f 100644
--- a/apps/meteor/client/views/account/security/AccountSecurityRoute.tsx
+++ b/apps/meteor/client/views/account/security/AccountSecurityRoute.tsx
@@ -1,5 +1,6 @@
 import { useSetting } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 import AccountSecurityPage from './AccountSecurityPage';
diff --git a/apps/meteor/client/views/account/security/BackupCodesModal.tsx b/apps/meteor/client/views/account/security/BackupCodesModal.tsx
index 86da7d987a9..503d491e87d 100644
--- a/apps/meteor/client/views/account/security/BackupCodesModal.tsx
+++ b/apps/meteor/client/views/account/security/BackupCodesModal.tsx
@@ -1,6 +1,7 @@
 import { Box, Button, Modal } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, useMemo } from 'react';
+import type { FC } from 'react';
+import React, { useMemo } from 'react';
 
 import TextCopy from '../../../components/TextCopy';
 
diff --git a/apps/meteor/client/views/account/security/EndToEnd.tsx b/apps/meteor/client/views/account/security/EndToEnd.tsx
index 3acbe2f5aa3..283dd1bd757 100644
--- a/apps/meteor/client/views/account/security/EndToEnd.tsx
+++ b/apps/meteor/client/views/account/security/EndToEnd.tsx
@@ -2,7 +2,8 @@ import { Box, Margins, PasswordInput, Field, FieldGroup, Button } from '@rocket.
 import { useLocalStorage, useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useToastMessageDispatch, useRoute, useUser, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
 import { Meteor } from 'meteor/meteor';
-import React, { ComponentProps, ReactElement, useCallback, useEffect } from 'react';
+import type { ComponentProps, ReactElement } from 'react';
+import React, { useCallback, useEffect } from 'react';
 
 import { e2e } from '../../../../app/e2e/client/rocketchat.e2e';
 import { callbacks } from '../../../../lib/callbacks';
diff --git a/apps/meteor/client/views/account/security/TwoFactorEmail.tsx b/apps/meteor/client/views/account/security/TwoFactorEmail.tsx
index 48453d58d57..dd203675351 100644
--- a/apps/meteor/client/views/account/security/TwoFactorEmail.tsx
+++ b/apps/meteor/client/views/account/security/TwoFactorEmail.tsx
@@ -1,6 +1,7 @@
 import { Box, Button, Margins } from '@rocket.chat/fuselage';
 import { useUser, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ComponentProps, ReactElement, useCallback } from 'react';
+import type { ComponentProps, ReactElement } from 'react';
+import React, { useCallback } from 'react';
 
 import { useEndpointAction } from '../../../hooks/useEndpointAction';
 
diff --git a/apps/meteor/client/views/account/security/TwoFactorTOTP.tsx b/apps/meteor/client/views/account/security/TwoFactorTOTP.tsx
index d9286052ea2..ecd113b1f02 100644
--- a/apps/meteor/client/views/account/security/TwoFactorTOTP.tsx
+++ b/apps/meteor/client/views/account/security/TwoFactorTOTP.tsx
@@ -1,7 +1,8 @@
 import { Box, Button, TextInput, Margins } from '@rocket.chat/fuselage';
 import { useSafely } from '@rocket.chat/fuselage-hooks';
 import { useSetModal, useToastMessageDispatch, useUser, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useState, useCallback, useEffect, ReactElement, ComponentProps } from 'react';
+import type { ReactElement, ComponentProps } from 'react';
+import React, { useState, useCallback, useEffect } from 'react';
 import qrcode from 'yaqrcode';
 
 import TextCopy from '../../../components/TextCopy';
diff --git a/apps/meteor/client/views/account/tokens/AccountTokensPage.tsx b/apps/meteor/client/views/account/tokens/AccountTokensPage.tsx
index ae594b7f6f4..5e7c46631cf 100644
--- a/apps/meteor/client/views/account/tokens/AccountTokensPage.tsx
+++ b/apps/meteor/client/views/account/tokens/AccountTokensPage.tsx
@@ -1,5 +1,6 @@
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import Page from '../../../components/Page';
 import AccountTokensTable from './AccountTokensTable';
diff --git a/apps/meteor/client/views/account/tokens/AccountTokensRoute.tsx b/apps/meteor/client/views/account/tokens/AccountTokensRoute.tsx
index 156ae90e3d5..ed8964db15b 100644
--- a/apps/meteor/client/views/account/tokens/AccountTokensRoute.tsx
+++ b/apps/meteor/client/views/account/tokens/AccountTokensRoute.tsx
@@ -1,5 +1,6 @@
 import { usePermission } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 import AccountTokensPage from './AccountTokensPage';
diff --git a/apps/meteor/client/views/account/tokens/AccountTokensTable/AccountTokensRow.tsx b/apps/meteor/client/views/account/tokens/AccountTokensTable/AccountTokensRow.tsx
index 31477fa347a..33a5b3855b5 100644
--- a/apps/meteor/client/views/account/tokens/AccountTokensTable/AccountTokensRow.tsx
+++ b/apps/meteor/client/views/account/tokens/AccountTokensTable/AccountTokensRow.tsx
@@ -1,7 +1,8 @@
-import { IPersonalAccessToken, Serialized } from '@rocket.chat/core-typings';
+import type { IPersonalAccessToken, Serialized } from '@rocket.chat/core-typings';
 import { ButtonGroup, IconButton, TableRow, TableCell } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useCallback, FC } from 'react';
+import type { FC } from 'react';
+import React, { useCallback } from 'react';
 
 import { useFormatDateAndTime } from '../../../../hooks/useFormatDateAndTime';
 
diff --git a/apps/meteor/client/views/account/tokens/AccountTokensTable/AccountTokensTable.tsx b/apps/meteor/client/views/account/tokens/AccountTokensTable/AccountTokensTable.tsx
index 65ce11ca5bb..933845704e3 100644
--- a/apps/meteor/client/views/account/tokens/AccountTokensTable/AccountTokensTable.tsx
+++ b/apps/meteor/client/views/account/tokens/AccountTokensTable/AccountTokensTable.tsx
@@ -1,6 +1,7 @@
 import { Box, Pagination, States, StatesAction, StatesActions, StatesIcon, StatesSubtitle, StatesTitle } from '@rocket.chat/fuselage';
 import { useSetModal, useToastMessageDispatch, useUserId, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, RefObject, useMemo, useCallback } from 'react';
+import type { ReactElement, RefObject } from 'react';
+import React, { useMemo, useCallback } from 'react';
 
 import GenericModal from '../../../../components/GenericModal';
 import {
diff --git a/apps/meteor/client/views/account/tokens/AccountTokensTable/AddToken.tsx b/apps/meteor/client/views/account/tokens/AccountTokensTable/AddToken.tsx
index e566e199e65..27a323206e8 100644
--- a/apps/meteor/client/views/account/tokens/AccountTokensTable/AddToken.tsx
+++ b/apps/meteor/client/views/account/tokens/AccountTokensTable/AddToken.tsx
@@ -1,7 +1,8 @@
 import { Box, TextInput, Button, Field, FieldGroup, Margins, CheckBox } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import { useSetModal, useToastMessageDispatch, useUserId, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useCallback } from 'react';
+import type { ReactElement } from 'react';
+import React, { useCallback } from 'react';
 
 import GenericModal from '../../../../components/GenericModal';
 import { useForm } from '../../../../hooks/useForm';
diff --git a/apps/meteor/client/views/admin/AdministrationLayout.tsx b/apps/meteor/client/views/admin/AdministrationLayout.tsx
index 2a909b1d824..09701c152d1 100644
--- a/apps/meteor/client/views/admin/AdministrationLayout.tsx
+++ b/apps/meteor/client/views/admin/AdministrationLayout.tsx
@@ -1,4 +1,5 @@
-import React, { useEffect, FC } from 'react';
+import type { FC } from 'react';
+import React, { useEffect } from 'react';
 
 import { SideNav } from '../../../app/ui-utils/client';
 
diff --git a/apps/meteor/client/views/admin/AdministrationRouter.tsx b/apps/meteor/client/views/admin/AdministrationRouter.tsx
index 1d4050d8528..72ff82b74d1 100644
--- a/apps/meteor/client/views/admin/AdministrationRouter.tsx
+++ b/apps/meteor/client/views/admin/AdministrationRouter.tsx
@@ -1,5 +1,6 @@
 import { useCurrentRoute, useRoute } from '@rocket.chat/ui-contexts';
-import React, { Suspense, ReactElement, useEffect, ReactNode } from 'react';
+import type { ReactElement, ReactNode } from 'react';
+import React, { Suspense, useEffect } from 'react';
 
 import PageSkeleton from '../../components/PageSkeleton';
 import SettingsProvider from '../../providers/SettingsProvider';
diff --git a/apps/meteor/client/views/admin/EditableSettingsContext.ts b/apps/meteor/client/views/admin/EditableSettingsContext.ts
index 2d013bc72cf..14d3e139c01 100644
--- a/apps/meteor/client/views/admin/EditableSettingsContext.ts
+++ b/apps/meteor/client/views/admin/EditableSettingsContext.ts
@@ -1,5 +1,5 @@
-import { ISettingBase, SectionName, SettingId, GroupId, TabId, ISettingColor } from '@rocket.chat/core-typings';
-import { SettingsContextQuery } from '@rocket.chat/ui-contexts';
+import type { ISettingBase, SectionName, SettingId, GroupId, TabId, ISettingColor } from '@rocket.chat/core-typings';
+import type { SettingsContextQuery } from '@rocket.chat/ui-contexts';
 import { createContext, useContext, useMemo } from 'react';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
 
diff --git a/apps/meteor/client/views/admin/apps/AccordionLoading.tsx b/apps/meteor/client/views/admin/apps/AccordionLoading.tsx
index bb6405c584c..9ce1c55e1e3 100644
--- a/apps/meteor/client/views/admin/apps/AccordionLoading.tsx
+++ b/apps/meteor/client/views/admin/apps/AccordionLoading.tsx
@@ -1,5 +1,6 @@
 import { Box, Skeleton, Margins } from '@rocket.chat/fuselage';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 const AccordionLoading: FC = () => (
 	<Box w='full' alignSelf='center'>
diff --git a/apps/meteor/client/views/admin/apps/AppDetailsPage/AppDetailsPage.tsx b/apps/meteor/client/views/admin/apps/AppDetailsPage/AppDetailsPage.tsx
index d4db14f16b0..2c135e491fb 100644
--- a/apps/meteor/client/views/admin/apps/AppDetailsPage/AppDetailsPage.tsx
+++ b/apps/meteor/client/views/admin/apps/AppDetailsPage/AppDetailsPage.tsx
@@ -1,11 +1,12 @@
-import { ISetting } from '@rocket.chat/apps-engine/definition/settings';
-import { App } from '@rocket.chat/core-typings';
+import type { ISetting } from '@rocket.chat/apps-engine/definition/settings';
+import type { App } from '@rocket.chat/core-typings';
 import { Button, ButtonGroup, Box, Throbber, Tabs } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useTranslation, useCurrentRoute, useRoute, useRouteParameter, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
-import React, { useState, useCallback, useRef, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useState, useCallback, useRef } from 'react';
 
-import { ISettings } from '../../../../../app/apps/client/@types/IOrchestrator';
+import type { ISettings } from '../../../../../app/apps/client/@types/IOrchestrator';
 import { Apps } from '../../../../../app/apps/client/orchestrator';
 import Page from '../../../../components/Page';
 import { handleAPIError } from '../helpers';
diff --git a/apps/meteor/client/views/admin/apps/AppDetailsPage/AppDetailsPageHeader.tsx b/apps/meteor/client/views/admin/apps/AppDetailsPage/AppDetailsPageHeader.tsx
index 14825e5bcbb..b177f0c3746 100644
--- a/apps/meteor/client/views/admin/apps/AppDetailsPage/AppDetailsPageHeader.tsx
+++ b/apps/meteor/client/views/admin/apps/AppDetailsPage/AppDetailsPageHeader.tsx
@@ -2,7 +2,8 @@ import type { App } from '@rocket.chat/core-typings';
 import { Box, Tag } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import AppAvatar from '../../../../components/avatar/AppAvatar';
 import AppMenu from '../AppMenu';
diff --git a/apps/meteor/client/views/admin/apps/AppDetailsPage/AppDetailsPageLoading.tsx b/apps/meteor/client/views/admin/apps/AppDetailsPage/AppDetailsPageLoading.tsx
index 8037bfc900b..4c4cb0647d9 100644
--- a/apps/meteor/client/views/admin/apps/AppDetailsPage/AppDetailsPageLoading.tsx
+++ b/apps/meteor/client/views/admin/apps/AppDetailsPage/AppDetailsPageLoading.tsx
@@ -1,5 +1,6 @@
 import { Box, Skeleton } from '@rocket.chat/fuselage';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 const AppDetailsPageLoading: FC = () => (
 	<Box display='flex' flexDirection='row' mbe='x20' w='full'>
diff --git a/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppDetails/AppDetails.tsx b/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppDetails/AppDetails.tsx
index b596b2ab338..22229890705 100644
--- a/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppDetails/AppDetails.tsx
+++ b/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppDetails/AppDetails.tsx
@@ -1,10 +1,12 @@
 import { Box, ButtonGroup, Callout, Chip, Margins } from '@rocket.chat/fuselage';
 import { ExternalLink } from '@rocket.chat/ui-client';
-import { TranslationKey, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import ScreenshotCarouselAnchor from '../../../components/ScreenshotCarouselAnchor';
-import { AppInfo } from '../../../definitions/AppInfo';
+import type { AppInfo } from '../../../definitions/AppInfo';
 import AppDetailsAPIs from './AppDetailsAPIs';
 
 const AppDetails = ({ app }: { app: AppInfo }): ReactElement => {
diff --git a/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppDetails/AppDetailsAPIs.tsx b/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppDetails/AppDetailsAPIs.tsx
index 6ffc6496671..ebeffff5230 100644
--- a/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppDetails/AppDetailsAPIs.tsx
+++ b/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppDetails/AppDetailsAPIs.tsx
@@ -1,7 +1,8 @@
-import { IApiEndpointMetadata } from '@rocket.chat/apps-engine/definition/api';
+import type { IApiEndpointMetadata } from '@rocket.chat/apps-engine/definition/api';
 import { Box } from '@rocket.chat/fuselage';
 import { useAbsoluteUrl, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, Fragment } from 'react';
+import type { FC } from 'react';
+import React, { Fragment } from 'react';
 
 import { apiCurlGetter } from '../../../helpers';
 
diff --git a/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppLogs/AppLogs.tsx b/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppLogs/AppLogs.tsx
index 22c54c8bfca..598deffcbcf 100644
--- a/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppLogs/AppLogs.tsx
+++ b/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppLogs/AppLogs.tsx
@@ -1,6 +1,7 @@
 import { Accordion, Box } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { useFormatDateAndTime } from '../../../../../../hooks/useFormatDateAndTime';
 import AccordionLoading from '../../../AccordionLoading';
diff --git a/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppLogs/AppLogsItem.tsx b/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppLogs/AppLogsItem.tsx
index 2134b471d78..7f17324d40b 100644
--- a/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppLogs/AppLogsItem.tsx
+++ b/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppLogs/AppLogsItem.tsx
@@ -1,7 +1,8 @@
-import { ILogEntry } from '@rocket.chat/core-typings';
+import type { ILogEntry } from '@rocket.chat/core-typings';
 import { Box, Accordion } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import AppLogsItemEntry from './AppLogsItemEntry';
 
diff --git a/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppLogs/AppLogsItemEntry.tsx b/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppLogs/AppLogsItemEntry.tsx
index 25ea68df133..bcc4467795d 100644
--- a/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppLogs/AppLogsItemEntry.tsx
+++ b/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppLogs/AppLogsItemEntry.tsx
@@ -1,6 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import { useHighlightedCode } from '../../../../../../hooks/useHighlightedCode';
 
diff --git a/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppReleases/AppReleases.tsx b/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppReleases/AppReleases.tsx
index b8a7cd289a4..94609603166 100644
--- a/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppReleases/AppReleases.tsx
+++ b/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppReleases/AppReleases.tsx
@@ -1,6 +1,7 @@
-import { App } from '@rocket.chat/core-typings';
+import type { App } from '@rocket.chat/core-typings';
 import { Accordion } from '@rocket.chat/fuselage';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { useEndpointData } from '../../../../../../hooks/useEndpointData';
 import { AsyncStatePhase } from '../../../../../../lib/asyncState/AsyncStatePhase';
diff --git a/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppReleases/AppReleasesItem.tsx b/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppReleases/AppReleasesItem.tsx
index c35476bf28e..c4725ea263a 100644
--- a/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppReleases/AppReleasesItem.tsx
+++ b/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppReleases/AppReleasesItem.tsx
@@ -1,6 +1,7 @@
 import { Accordion, Box } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { useTimeAgo } from '../../../../../../hooks/useTimeAgo';
 
diff --git a/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppSecurity.tsx b/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppSecurity.tsx
index 8ec673597d1..09b0cbe0786 100644
--- a/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppSecurity.tsx
+++ b/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppSecurity.tsx
@@ -1,7 +1,8 @@
-import { AppPermission } from '@rocket.chat/core-typings';
+import type { AppPermission } from '@rocket.chat/core-typings';
 import { Box, Margins } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import AppPermissionsList from '../../components/AppPermissionsList';
 
diff --git a/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppSettings/AppSetting.tsx b/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppSettings/AppSetting.tsx
index 5aec371aacc..75ab0af8de4 100644
--- a/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppSettings/AppSetting.tsx
+++ b/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppSettings/AppSetting.tsx
@@ -1,7 +1,8 @@
-import { ISettingSelectValue } from '@rocket.chat/apps-engine/definition/settings';
-import { ISettingBase, SettingValue } from '@rocket.chat/core-typings';
+import type { ISettingSelectValue } from '@rocket.chat/apps-engine/definition/settings';
+import type { ISettingBase, SettingValue } from '@rocket.chat/core-typings';
 import { useRouteParameter, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useMemo, useCallback, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo, useCallback } from 'react';
 
 import MarkdownText from '../../../../../../components/MarkdownText';
 import MemoizedSetting from '../../../../settings/MemoizedSetting';
diff --git a/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppSettings/AppSettings.tsx b/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppSettings/AppSettings.tsx
index 1e50f1a34ae..1b81555474e 100644
--- a/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppSettings/AppSettings.tsx
+++ b/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppSettings/AppSettings.tsx
@@ -1,10 +1,11 @@
-import { ISetting } from '@rocket.chat/apps-engine/definition/settings';
-import { SettingValue } from '@rocket.chat/core-typings';
+import type { ISetting } from '@rocket.chat/apps-engine/definition/settings';
+import type { SettingValue } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, useMemo, useEffect, MutableRefObject } from 'react';
+import type { FC, MutableRefObject } from 'react';
+import React, { useMemo, useEffect } from 'react';
 
-import { ISettings } from '../../../../../../../app/apps/client/@types/IOrchestrator';
+import type { ISettings } from '../../../../../../../app/apps/client/@types/IOrchestrator';
 import { useForm } from '../../../../../../hooks/useForm';
 import AppSettingsAssembler from './AppSettingsAssembler';
 
diff --git a/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppSettings/AppSettingsAssembler.tsx b/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppSettings/AppSettingsAssembler.tsx
index eb67909e859..9216fa5867c 100644
--- a/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppSettings/AppSettingsAssembler.tsx
+++ b/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppSettings/AppSettingsAssembler.tsx
@@ -1,9 +1,10 @@
-import { SettingValue } from '@rocket.chat/core-typings';
+import type { SettingValue } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
 import { capitalize } from '@rocket.chat/string-helpers';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
-import { ISettings } from '../../../../../../../app/apps/client/@types/IOrchestrator';
+import type { ISettings } from '../../../../../../../app/apps/client/@types/IOrchestrator';
 import AppSetting from './AppSetting';
 
 type AppSettingsAssemblerProps = {
diff --git a/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppStatus/AppStatus.tsx b/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppStatus/AppStatus.tsx
index e478aa4a227..e6d92cd2adf 100644
--- a/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppStatus/AppStatus.tsx
+++ b/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppStatus/AppStatus.tsx
@@ -1,8 +1,10 @@
 import type { App } from '@rocket.chat/core-typings';
 import { Box, Button, Icon, Throbber, Tag, Margins } from '@rocket.chat/fuselage';
 import { useSafely } from '@rocket.chat/fuselage-hooks';
-import { useSetModal, useMethod, useTranslation, TranslationKey } from '@rocket.chat/ui-contexts';
-import React, { useCallback, useState, memo, ReactElement, Fragment } from 'react';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useSetModal, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
+import type { ReactElement } from 'react';
+import React, { useCallback, useState, memo, Fragment } from 'react';
 
 import { Apps } from '../../../../../../../app/apps/client/orchestrator';
 import AppPermissionsReviewModal from '../../../AppPermissionsReviewModal';
diff --git a/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppStatus/AppStatusPriceDisplay.tsx b/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppStatus/AppStatusPriceDisplay.tsx
index 5645cf4856f..38d326f8cac 100644
--- a/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppStatus/AppStatusPriceDisplay.tsx
+++ b/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppStatus/AppStatusPriceDisplay.tsx
@@ -1,7 +1,9 @@
 import type { AppPricingPlan, PurchaseType } from '@rocket.chat/core-typings';
 import { Box, Tag } from '@rocket.chat/fuselage';
-import { TranslationKey, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, useMemo } from 'react';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
+import type { FC } from 'react';
+import React, { useMemo } from 'react';
 
 import { formatPriceAndPurchaseType } from '../../../helpers';
 
diff --git a/apps/meteor/client/views/admin/apps/AppPermissionsReviewModal.tsx b/apps/meteor/client/views/admin/apps/AppPermissionsReviewModal.tsx
index 939e37b98b1..07443e03b70 100644
--- a/apps/meteor/client/views/admin/apps/AppPermissionsReviewModal.tsx
+++ b/apps/meteor/client/views/admin/apps/AppPermissionsReviewModal.tsx
@@ -1,6 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import GenericModal from '../../../components/GenericModal';
 import AppPermissionsList from './components/AppPermissionsList';
diff --git a/apps/meteor/client/views/admin/apps/AppUpdateModal.tsx b/apps/meteor/client/views/admin/apps/AppUpdateModal.tsx
index ccfb89881fd..3c9c6b0eab8 100644
--- a/apps/meteor/client/views/admin/apps/AppUpdateModal.tsx
+++ b/apps/meteor/client/views/admin/apps/AppUpdateModal.tsx
@@ -1,6 +1,7 @@
 import { Button, Modal } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 type AppUpdateModalProps = {
 	confirm: () => void;
diff --git a/apps/meteor/client/views/admin/apps/AppsContext.tsx b/apps/meteor/client/views/admin/apps/AppsContext.tsx
index 09bf4020719..730c84d18d4 100644
--- a/apps/meteor/client/views/admin/apps/AppsContext.tsx
+++ b/apps/meteor/client/views/admin/apps/AppsContext.tsx
@@ -1,7 +1,8 @@
 import { createContext, useContext } from 'react';
 
-import { AsyncState, AsyncStatePhase } from '../../../lib/asyncState';
-import { App } from './types';
+import type { AsyncState } from '../../../lib/asyncState';
+import { AsyncStatePhase } from '../../../lib/asyncState';
+import type { App } from './types';
 
 type AppsContextValue = {
 	installedApps: AsyncState<{ apps: App[] }>;
diff --git a/apps/meteor/client/views/admin/apps/AppsList/AppRow.tsx b/apps/meteor/client/views/admin/apps/AppsList/AppRow.tsx
index f667d3c9f70..7632b098d2d 100644
--- a/apps/meteor/client/views/admin/apps/AppsList/AppRow.tsx
+++ b/apps/meteor/client/views/admin/apps/AppsList/AppRow.tsx
@@ -3,7 +3,8 @@ import { css } from '@rocket.chat/css-in-js';
 import { Badge, Box } from '@rocket.chat/fuselage';
 import colors from '@rocket.chat/fuselage-tokens/colors';
 import { useCurrentRoute, useRoute, useRouteParameter } from '@rocket.chat/ui-contexts';
-import React, { memo, KeyboardEvent, MouseEvent, ReactElement } from 'react';
+import type { KeyboardEvent, MouseEvent, ReactElement } from 'react';
+import React, { memo } from 'react';
 import semver from 'semver';
 
 import AppAvatar from '../../../../components/avatar/AppAvatar';
diff --git a/apps/meteor/client/views/admin/apps/AppsList/AppsList.tsx b/apps/meteor/client/views/admin/apps/AppsList/AppsList.tsx
index 00dda95a4af..f0345bfce4b 100644
--- a/apps/meteor/client/views/admin/apps/AppsList/AppsList.tsx
+++ b/apps/meteor/client/views/admin/apps/AppsList/AppsList.tsx
@@ -1,6 +1,7 @@
-import { App } from '@rocket.chat/core-typings';
+import type { App } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import AppRow from './AppRow';
 
diff --git a/apps/meteor/client/views/admin/apps/AppsPage/AppsFilters.tsx b/apps/meteor/client/views/admin/apps/AppsPage/AppsFilters.tsx
index b77da9994c0..67532808cac 100644
--- a/apps/meteor/client/views/admin/apps/AppsPage/AppsFilters.tsx
+++ b/apps/meteor/client/views/admin/apps/AppsPage/AppsFilters.tsx
@@ -1,13 +1,14 @@
 import { useMediaQuery } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import FilterByText from '../../../../components/FilterByText';
 import CategoryDropDown from '../components/CategoryFilter/CategoryDropDown';
 import TagList from '../components/CategoryFilter/TagList';
 import RadioDropDown from '../components/RadioDropDown/RadioDropDown';
-import { CategoryDropdownItem, CategoryOnSelected, selectedCategoriesList } from '../definitions/CategoryDropdownDefinitions';
-import { RadioDropDownGroup, RadioDropDownOnSelected } from '../definitions/RadioDropDownDefinitions';
+import type { CategoryDropdownItem, CategoryOnSelected, selectedCategoriesList } from '../definitions/CategoryDropdownDefinitions';
+import type { RadioDropDownGroup, RadioDropDownOnSelected } from '../definitions/RadioDropDownDefinitions';
 
 type AppsFiltersProps = {
 	setText: React.Dispatch<React.SetStateAction<string>> & {
diff --git a/apps/meteor/client/views/admin/apps/AppsPage/AppsPage.tsx b/apps/meteor/client/views/admin/apps/AppsPage/AppsPage.tsx
index 23485b04dc8..819a0fbc744 100644
--- a/apps/meteor/client/views/admin/apps/AppsPage/AppsPage.tsx
+++ b/apps/meteor/client/views/admin/apps/AppsPage/AppsPage.tsx
@@ -1,6 +1,7 @@
 import { Button, ButtonGroup, Icon, Skeleton, Tabs } from '@rocket.chat/fuselage';
 import { useRoute, useSetting, useMethod, useTranslation, useCurrentRoute, useRouteParameter } from '@rocket.chat/ui-contexts';
-import React, { useEffect, useState, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useEffect, useState } from 'react';
 
 import Page from '../../../../components/Page';
 import AppsPageContent from './AppsPageContent';
diff --git a/apps/meteor/client/views/admin/apps/AppsPage/AppsPageConnectionError.tsx b/apps/meteor/client/views/admin/apps/AppsPage/AppsPageConnectionError.tsx
index 4afe7f8a192..c6edec42574 100644
--- a/apps/meteor/client/views/admin/apps/AppsPage/AppsPageConnectionError.tsx
+++ b/apps/meteor/client/views/admin/apps/AppsPage/AppsPageConnectionError.tsx
@@ -1,6 +1,7 @@
 import { Box, States, StatesIcon, StatesTitle, StatesSubtitle, StatesActions, StatesAction, Icon } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 const AppsPageContentError = ({ onButtonClick }: { onButtonClick: () => void }): ReactElement => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/admin/apps/AppsPage/AppsPageContent.tsx b/apps/meteor/client/views/admin/apps/AppsPage/AppsPageContent.tsx
index 39d1e0201a1..66099ec76fa 100644
--- a/apps/meteor/client/views/admin/apps/AppsPage/AppsPageContent.tsx
+++ b/apps/meteor/client/views/admin/apps/AppsPage/AppsPageContent.tsx
@@ -1,13 +1,14 @@
 import { Pagination, Divider } from '@rocket.chat/fuselage';
 import { useDebouncedState } from '@rocket.chat/fuselage-hooks';
 import { useCurrentRoute, useRoute, useRouteParameter, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useMemo, useState } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo, useState } from 'react';
 
 import { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
 import { AsyncStatePhase } from '../../../../lib/asyncState';
 import { useAppsReload, useAppsResult } from '../AppsContext';
 import AppsList from '../AppsList';
-import { RadioDropDownGroup } from '../definitions/RadioDropDownDefinitions';
+import type { RadioDropDownGroup } from '../definitions/RadioDropDownDefinitions';
 import { useCategories } from '../hooks/useCategories';
 import { useFilteredApps } from '../hooks/useFilteredApps';
 import { useRadioToggle } from '../hooks/useRadioToggle';
diff --git a/apps/meteor/client/views/admin/apps/AppsPage/AppsPageContentSkeleton.tsx b/apps/meteor/client/views/admin/apps/AppsPage/AppsPageContentSkeleton.tsx
index bbd21947f71..059c43d0be2 100644
--- a/apps/meteor/client/views/admin/apps/AppsPage/AppsPageContentSkeleton.tsx
+++ b/apps/meteor/client/views/admin/apps/AppsPage/AppsPageContentSkeleton.tsx
@@ -1,5 +1,6 @@
 import { Skeleton, Box } from '@rocket.chat/fuselage';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 const AppsPageContentSkeleton = (): ReactElement => {
 	const loadingRows = Array.from({ length: 3 }, (_, i) => <Skeleton key={i} height='x56' mbe='x8' width='100%' variant='rect' />);
diff --git a/apps/meteor/client/views/admin/apps/AppsPage/FeaturedAppsSections.tsx b/apps/meteor/client/views/admin/apps/AppsPage/FeaturedAppsSections.tsx
index 0327316f51f..75cd94dd1fe 100644
--- a/apps/meteor/client/views/admin/apps/AppsPage/FeaturedAppsSections.tsx
+++ b/apps/meteor/client/views/admin/apps/AppsPage/FeaturedAppsSections.tsx
@@ -1,6 +1,7 @@
-import { App } from '@rocket.chat/core-typings';
+import type { App } from '@rocket.chat/core-typings';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import AppsList from '../AppsList';
 import normalizeFeaturedApps from '../helpers/normalizeFeaturedApps';
diff --git a/apps/meteor/client/views/admin/apps/AppsPage/NoInstalledAppMatchesEmptyState.tsx b/apps/meteor/client/views/admin/apps/AppsPage/NoInstalledAppMatchesEmptyState.tsx
index 8dfac474b77..df83b5359ce 100644
--- a/apps/meteor/client/views/admin/apps/AppsPage/NoInstalledAppMatchesEmptyState.tsx
+++ b/apps/meteor/client/views/admin/apps/AppsPage/NoInstalledAppMatchesEmptyState.tsx
@@ -10,7 +10,8 @@ import {
 	StatesAction,
 } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 type NoInstalledAppMatchesEmptyStateProps = {
 	shouldShowSearchText: boolean;
diff --git a/apps/meteor/client/views/admin/apps/AppsPage/NoInstalledAppsFoundEmptyState.tsx b/apps/meteor/client/views/admin/apps/AppsPage/NoInstalledAppsFoundEmptyState.tsx
index 1977c8f149c..581b852301e 100644
--- a/apps/meteor/client/views/admin/apps/AppsPage/NoInstalledAppsFoundEmptyState.tsx
+++ b/apps/meteor/client/views/admin/apps/AppsPage/NoInstalledAppsFoundEmptyState.tsx
@@ -1,6 +1,7 @@
 import { Box, States, StatesIcon, StatesTitle, StatesSubtitle, StatesActions, StatesAction } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 const NoInstalledAppsFoundEmptyState = ({ onButtonClick }: { onButtonClick: () => void }): ReactElement => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/admin/apps/AppsPage/NoMarketplaceOrInstalledAppMatchesEmptyState.tsx b/apps/meteor/client/views/admin/apps/AppsPage/NoMarketplaceOrInstalledAppMatchesEmptyState.tsx
index eb2bdcb10dc..0fff2814e12 100644
--- a/apps/meteor/client/views/admin/apps/AppsPage/NoMarketplaceOrInstalledAppMatchesEmptyState.tsx
+++ b/apps/meteor/client/views/admin/apps/AppsPage/NoMarketplaceOrInstalledAppMatchesEmptyState.tsx
@@ -10,7 +10,8 @@ import {
 	StatesTitle,
 } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 type NoMarketplaceOrInstalledAppMatchesEmptyStateProps = { shouldShowSearchText: boolean; text: string };
 
diff --git a/apps/meteor/client/views/admin/apps/AppsProvider.tsx b/apps/meteor/client/views/admin/apps/AppsProvider.tsx
index f1255b554f4..aae463a3640 100644
--- a/apps/meteor/client/views/admin/apps/AppsProvider.tsx
+++ b/apps/meteor/client/views/admin/apps/AppsProvider.tsx
@@ -1,13 +1,15 @@
-import { AppStatus } from '@rocket.chat/apps-engine/definition/AppStatus';
+import type { AppStatus } from '@rocket.chat/apps-engine/definition/AppStatus';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import React, { useEffect, FC, useReducer, Reducer, useCallback } from 'react';
+import type { FC, Reducer } from 'react';
+import React, { useEffect, useReducer, useCallback } from 'react';
 
 import { AppEvents } from '../../../../app/apps/client/communication';
 import { Apps } from '../../../../app/apps/client/orchestrator';
-import { AsyncState, AsyncStatePhase } from '../../../lib/asyncState';
+import type { AsyncState } from '../../../lib/asyncState';
+import { AsyncStatePhase } from '../../../lib/asyncState';
 import { AppsContext } from './AppsContext';
 import { handleAPIError } from './helpers';
-import { App } from './types';
+import type { App } from './types';
 
 type ListenersMapping = {
 	readonly [P in keyof typeof AppEvents]?: (...args: any[]) => void;
diff --git a/apps/meteor/client/views/admin/apps/AppsRoute.tsx b/apps/meteor/client/views/admin/apps/AppsRoute.tsx
index 34c966b230e..2b27fb6364f 100644
--- a/apps/meteor/client/views/admin/apps/AppsRoute.tsx
+++ b/apps/meteor/client/views/admin/apps/AppsRoute.tsx
@@ -1,5 +1,6 @@
 import { useRouteParameter, useRoute, usePermission, useMethod } from '@rocket.chat/ui-contexts';
-import React, { useState, useEffect, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useState, useEffect } from 'react';
 
 import PageSkeleton from '../../../components/PageSkeleton';
 import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
diff --git a/apps/meteor/client/views/admin/apps/AppsWhatIsIt.tsx b/apps/meteor/client/views/admin/apps/AppsWhatIsIt.tsx
index 0597c75111d..a4aff400ab0 100644
--- a/apps/meteor/client/views/admin/apps/AppsWhatIsIt.tsx
+++ b/apps/meteor/client/views/admin/apps/AppsWhatIsIt.tsx
@@ -1,7 +1,8 @@
 import { Button, Box, Throbber } from '@rocket.chat/fuselage';
 import { ExternalLink } from '@rocket.chat/ui-client';
 import { useRoute, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, useState } from 'react';
+import type { FC } from 'react';
+import React, { useState } from 'react';
 
 import { Apps } from '../../../../app/apps/client';
 import Page from '../../../components/Page';
diff --git a/apps/meteor/client/views/admin/apps/BundleChips.tsx b/apps/meteor/client/views/admin/apps/BundleChips.tsx
index cf231e16f9e..77cef34df9f 100644
--- a/apps/meteor/client/views/admin/apps/BundleChips.tsx
+++ b/apps/meteor/client/views/admin/apps/BundleChips.tsx
@@ -1,8 +1,9 @@
 import { Tag } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
-import { App } from './types';
+import type { App } from './types';
 
 type BundleChipsProps = {
 	bundledIn: {
diff --git a/apps/meteor/client/views/admin/apps/CloudLoginModal.tsx b/apps/meteor/client/views/admin/apps/CloudLoginModal.tsx
index bf788bc2060..424f3c50d7c 100644
--- a/apps/meteor/client/views/admin/apps/CloudLoginModal.tsx
+++ b/apps/meteor/client/views/admin/apps/CloudLoginModal.tsx
@@ -1,5 +1,6 @@
 import { useSetModal, useRoute, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import GenericModal from '../../../components/GenericModal';
 
diff --git a/apps/meteor/client/views/admin/apps/components/AppPermissionsList.tsx b/apps/meteor/client/views/admin/apps/components/AppPermissionsList.tsx
index de3c0272276..e5a7d66d921 100644
--- a/apps/meteor/client/views/admin/apps/components/AppPermissionsList.tsx
+++ b/apps/meteor/client/views/admin/apps/components/AppPermissionsList.tsx
@@ -1,7 +1,9 @@
-import { AppPermission } from '@rocket.chat/core-typings';
+import type { AppPermission } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
-import { TranslationKey, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { Fragment, ReactElement } from 'react';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
+import type { ReactElement } from 'react';
+import React, { Fragment } from 'react';
 
 const defaultPermissions = [
 	'user.read',
diff --git a/apps/meteor/client/views/admin/apps/components/CategoryFilter/CategoryDropDown.stories.tsx b/apps/meteor/client/views/admin/apps/components/CategoryFilter/CategoryDropDown.stories.tsx
index 6316cc3db86..306e8f2e4e9 100644
--- a/apps/meteor/client/views/admin/apps/components/CategoryFilter/CategoryDropDown.stories.tsx
+++ b/apps/meteor/client/views/admin/apps/components/CategoryFilter/CategoryDropDown.stories.tsx
@@ -1,8 +1,8 @@
 import { ButtonGroup } from '@rocket.chat/fuselage';
-import { Story } from '@storybook/react';
+import type { Story } from '@storybook/react';
 import React, { useState } from 'react';
 
-import { CategoryDropDownListProps } from '../../definitions/CategoryDropdownDefinitions';
+import type { CategoryDropDownListProps } from '../../definitions/CategoryDropdownDefinitions';
 import { useCategories } from '../../hooks/useCategories';
 import { useCategoryToggle } from '../../hooks/useCategoryToggle';
 import CategoryDropDown from './CategoryDropDown';
diff --git a/apps/meteor/client/views/admin/apps/components/CategoryFilter/CategoryDropDown.tsx b/apps/meteor/client/views/admin/apps/components/CategoryFilter/CategoryDropDown.tsx
index d1681271d64..cff337ab4a7 100644
--- a/apps/meteor/client/views/admin/apps/components/CategoryFilter/CategoryDropDown.tsx
+++ b/apps/meteor/client/views/admin/apps/components/CategoryFilter/CategoryDropDown.tsx
@@ -1,7 +1,8 @@
 import { useToggle } from '@rocket.chat/fuselage-hooks';
-import React, { useRef, FC, useCallback } from 'react';
+import type { FC } from 'react';
+import React, { useRef, useCallback } from 'react';
 
-import { CategoryDropdownItem, CategoryDropDownListProps } from '../../definitions/CategoryDropdownDefinitions';
+import type { CategoryDropdownItem, CategoryDropDownListProps } from '../../definitions/CategoryDropdownDefinitions';
 import { isValidReference } from '../../helpers/isValidReference';
 import { onMouseEventPreventSideEffects } from '../../helpers/onMouseEventPreventSideEffects';
 import DropDownListWrapper from '../DropDownListWrapper';
diff --git a/apps/meteor/client/views/admin/apps/components/CategoryFilter/CategoryDropDownAnchor.tsx b/apps/meteor/client/views/admin/apps/components/CategoryFilter/CategoryDropDownAnchor.tsx
index 2f2977b871b..722e9c472b8 100644
--- a/apps/meteor/client/views/admin/apps/components/CategoryFilter/CategoryDropDownAnchor.tsx
+++ b/apps/meteor/client/views/admin/apps/components/CategoryFilter/CategoryDropDownAnchor.tsx
@@ -1,6 +1,8 @@
-import { Box, Button, Icon, Select } from '@rocket.chat/fuselage';
+import type { Select } from '@rocket.chat/fuselage';
+import { Box, Button, Icon } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ComponentProps, forwardRef } from 'react';
+import type { ComponentProps } from 'react';
+import React, { forwardRef } from 'react';
 
 const CategoryDropDownAnchor = forwardRef<HTMLInputElement, Partial<ComponentProps<typeof Select>> & { selectedCategoriesCount: number }>(
 	function CategoryDropDownAnchor(props, ref) {
diff --git a/apps/meteor/client/views/admin/apps/components/CategoryFilter/CategoryDropDownList.tsx b/apps/meteor/client/views/admin/apps/components/CategoryFilter/CategoryDropDownList.tsx
index e97e109bd13..f8880ebf352 100644
--- a/apps/meteor/client/views/admin/apps/components/CategoryFilter/CategoryDropDownList.tsx
+++ b/apps/meteor/client/views/admin/apps/components/CategoryFilter/CategoryDropDownList.tsx
@@ -1,7 +1,8 @@
 import { Box, CheckBox, Option, Tile } from '@rocket.chat/fuselage';
-import React, { FC, Fragment } from 'react';
+import type { FC } from 'react';
+import React, { Fragment } from 'react';
 
-import { CategoryDropDownListProps } from '../../definitions/CategoryDropdownDefinitions';
+import type { CategoryDropDownListProps } from '../../definitions/CategoryDropdownDefinitions';
 
 const CategoryDropDownList: FC<CategoryDropDownListProps> = function CategoryDropDownList({ groups, onSelected }) {
 	return (
diff --git a/apps/meteor/client/views/admin/apps/components/CategoryFilter/TagList.tsx b/apps/meteor/client/views/admin/apps/components/CategoryFilter/TagList.tsx
index 7f3198749cd..1e57d4cdefd 100644
--- a/apps/meteor/client/views/admin/apps/components/CategoryFilter/TagList.tsx
+++ b/apps/meteor/client/views/admin/apps/components/CategoryFilter/TagList.tsx
@@ -1,7 +1,8 @@
 import { Chip, ButtonGroup } from '@rocket.chat/fuselage';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
-import { CategoryDropdownItem, CategoryDropDownListProps } from '../../definitions/CategoryDropdownDefinitions';
+import type { CategoryDropdownItem, CategoryDropDownListProps } from '../../definitions/CategoryDropdownDefinitions';
 
 const TagList: FC<{
 	categories: (CategoryDropdownItem & { checked: true })[];
diff --git a/apps/meteor/client/views/admin/apps/components/DropDownListWrapper.tsx b/apps/meteor/client/views/admin/apps/components/DropDownListWrapper.tsx
index ae2b1ca2b8e..a0a12f04a16 100644
--- a/apps/meteor/client/views/admin/apps/components/DropDownListWrapper.tsx
+++ b/apps/meteor/client/views/admin/apps/components/DropDownListWrapper.tsx
@@ -1,6 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
 import { usePosition, useOutsideClick } from '@rocket.chat/fuselage-hooks';
-import React, { forwardRef, ComponentProps, useRef } from 'react';
+import type { ComponentProps } from 'react';
+import React, { forwardRef, useRef } from 'react';
 
 const options = {
 	margin: 8,
diff --git a/apps/meteor/client/views/admin/apps/components/RadioButtonList.tsx b/apps/meteor/client/views/admin/apps/components/RadioButtonList.tsx
index 6d38e81d25e..5d272555094 100644
--- a/apps/meteor/client/views/admin/apps/components/RadioButtonList.tsx
+++ b/apps/meteor/client/views/admin/apps/components/RadioButtonList.tsx
@@ -1,7 +1,8 @@
 import { Box, Option, RadioButton, Tile } from '@rocket.chat/fuselage';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
-import { RadioDropDownProps } from '../definitions/RadioDropDownDefinitions';
+import type { RadioDropDownProps } from '../definitions/RadioDropDownDefinitions';
 
 const RadioButtonList = ({ group, onSelected }: RadioDropDownProps): ReactElement => (
 	<Tile overflow='auto' pb='x12' pi={0} elevation='2' w='full' bg='alternative' borderRadius='x2'>
diff --git a/apps/meteor/client/views/admin/apps/components/RadioDropDown/RadioDownAnchor.tsx b/apps/meteor/client/views/admin/apps/components/RadioDropDown/RadioDownAnchor.tsx
index 059b2a58598..1e8d2d7438b 100644
--- a/apps/meteor/client/views/admin/apps/components/RadioDropDown/RadioDownAnchor.tsx
+++ b/apps/meteor/client/views/admin/apps/components/RadioDropDown/RadioDownAnchor.tsx
@@ -1,7 +1,8 @@
 import { Select } from '@rocket.chat/fuselage';
-import React, { ComponentProps, forwardRef } from 'react';
+import type { ComponentProps } from 'react';
+import React, { forwardRef } from 'react';
 
-import { RadioDropDownGroup } from '../../definitions/RadioDropDownDefinitions';
+import type { RadioDropDownGroup } from '../../definitions/RadioDropDownDefinitions';
 
 const RadioDownAnchor = forwardRef<HTMLInputElement, Partial<ComponentProps<typeof Select>> & { group: RadioDropDownGroup }>(
 	function SortDropDownAnchor(props, ref) {
diff --git a/apps/meteor/client/views/admin/apps/components/RadioDropDown/RadioDropDown.stories.tsx b/apps/meteor/client/views/admin/apps/components/RadioDropDown/RadioDropDown.stories.tsx
index b71c56b1564..724773be79c 100644
--- a/apps/meteor/client/views/admin/apps/components/RadioDropDown/RadioDropDown.stories.tsx
+++ b/apps/meteor/client/views/admin/apps/components/RadioDropDown/RadioDropDown.stories.tsx
@@ -1,4 +1,4 @@
-import { Story } from '@storybook/react';
+import type { Story } from '@storybook/react';
 import React, { useState } from 'react';
 
 import { useRadioToggle } from '../../hooks/useRadioToggle';
diff --git a/apps/meteor/client/views/admin/apps/components/RadioDropDown/RadioDropDown.tsx b/apps/meteor/client/views/admin/apps/components/RadioDropDown/RadioDropDown.tsx
index 814154bb94d..61e8c0e16e9 100644
--- a/apps/meteor/client/views/admin/apps/components/RadioDropDown/RadioDropDown.tsx
+++ b/apps/meteor/client/views/admin/apps/components/RadioDropDown/RadioDropDown.tsx
@@ -1,8 +1,9 @@
-import { Select } from '@rocket.chat/fuselage';
+import type { Select } from '@rocket.chat/fuselage';
 import { useToggle } from '@rocket.chat/fuselage-hooks';
-import React, { ComponentProps, ReactElement, useCallback, useRef } from 'react';
+import type { ComponentProps, ReactElement } from 'react';
+import React, { useCallback, useRef } from 'react';
 
-import { RadioDropDownProps } from '../../definitions/RadioDropDownDefinitions';
+import type { RadioDropDownProps } from '../../definitions/RadioDropDownDefinitions';
 import { isValidReference } from '../../helpers/isValidReference';
 import { onMouseEventPreventSideEffects } from '../../helpers/onMouseEventPreventSideEffects';
 import DropDownListWrapper from '../DropDownListWrapper';
diff --git a/apps/meteor/client/views/admin/apps/components/ScreenshotCarousel.tsx b/apps/meteor/client/views/admin/apps/components/ScreenshotCarousel.tsx
index cbc0f7e4989..5d866bc2b8f 100644
--- a/apps/meteor/client/views/admin/apps/components/ScreenshotCarousel.tsx
+++ b/apps/meteor/client/views/admin/apps/components/ScreenshotCarousel.tsx
@@ -1,7 +1,8 @@
-import { AppScreenshot } from '@rocket.chat/core-typings';
+import type { AppScreenshot } from '@rocket.chat/core-typings';
 import { Box, Button, Icon } from '@rocket.chat/fuselage';
 import colors from '@rocket.chat/fuselage-tokens/colors';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 type ScreenshotCarouselProps = {
 	AppScreenshots: Array<AppScreenshot>;
diff --git a/apps/meteor/client/views/admin/apps/components/ScreenshotCarouselAnchor.tsx b/apps/meteor/client/views/admin/apps/components/ScreenshotCarouselAnchor.tsx
index f1d1d07e002..cdbeda4e3c8 100644
--- a/apps/meteor/client/views/admin/apps/components/ScreenshotCarouselAnchor.tsx
+++ b/apps/meteor/client/views/admin/apps/components/ScreenshotCarouselAnchor.tsx
@@ -1,8 +1,9 @@
-import { AppScreenshot } from '@rocket.chat/core-typings';
+import type { AppScreenshot } from '@rocket.chat/core-typings';
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Icon } from '@rocket.chat/fuselage';
 import colors from '@rocket.chat/fuselage-tokens/colors';
-import React, { ReactElement, useCallback, useEffect, useState } from 'react';
+import type { ReactElement } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import { createPortal } from 'react-dom';
 
 import ScreenshotCarousel from './ScreenshotCarousel';
diff --git a/apps/meteor/client/views/admin/apps/definitions/AppInfo.ts b/apps/meteor/client/views/admin/apps/definitions/AppInfo.ts
index 87617258e67..7569e17c429 100644
--- a/apps/meteor/client/views/admin/apps/definitions/AppInfo.ts
+++ b/apps/meteor/client/views/admin/apps/definitions/AppInfo.ts
@@ -1,8 +1,8 @@
-import { IApiEndpointMetadata } from '@rocket.chat/apps-engine/definition/api';
-import { AppScreenshot } from '@rocket.chat/core-typings';
+import type { IApiEndpointMetadata } from '@rocket.chat/apps-engine/definition/api';
+import type { AppScreenshot } from '@rocket.chat/core-typings';
 
-import { ISettings } from '../../../../../app/apps/client/@types/IOrchestrator';
-import { App } from '../types';
+import type { ISettings } from '../../../../../app/apps/client/@types/IOrchestrator';
+import type { App } from '../types';
 
 export type AppInfo = App & {
 	settings?: ISettings;
diff --git a/apps/meteor/client/views/admin/apps/helpers.ts b/apps/meteor/client/views/admin/apps/helpers.ts
index 6e2e5e97030..8bf001f1bfe 100644
--- a/apps/meteor/client/views/admin/apps/helpers.ts
+++ b/apps/meteor/client/views/admin/apps/helpers.ts
@@ -1,6 +1,6 @@
 import { AppStatus } from '@rocket.chat/apps-engine/definition/AppStatus';
-import { IApiEndpointMetadata } from '@rocket.chat/apps-engine/definition/api';
-import { App, AppPricingPlan, PurchaseType } from '@rocket.chat/core-typings';
+import type { IApiEndpointMetadata } from '@rocket.chat/apps-engine/definition/api';
+import type { App, AppPricingPlan, PurchaseType } from '@rocket.chat/core-typings';
 import semver from 'semver';
 
 import { Utilities } from '../../../../app/apps/lib/misc/Utilities';
@@ -9,6 +9,7 @@ import { dispatchToastMessage } from '../../../lib/toast';
 
 export const appEnabledStatuses = [AppStatus.AUTO_ENABLED, AppStatus.MANUALLY_ENABLED];
 
+// eslint-disable-next-line @typescript-eslint/naming-convention
 interface ApiError {
 	xhr: {
 		responseJSON: {
diff --git a/apps/meteor/client/views/admin/apps/helpers/filterAppsByCategories.ts b/apps/meteor/client/views/admin/apps/helpers/filterAppsByCategories.ts
index bed578e0373..0636ba8a5d0 100644
--- a/apps/meteor/client/views/admin/apps/helpers/filterAppsByCategories.ts
+++ b/apps/meteor/client/views/admin/apps/helpers/filterAppsByCategories.ts
@@ -1,4 +1,4 @@
-import { App } from '../types';
+import type { App } from '../types';
 
 export const filterAppsByCategories = (app: App, categories: string[]): boolean =>
 	!app.categories || categories.length === 0 || app.categories.some((c) => categories.includes(c));
diff --git a/apps/meteor/client/views/admin/apps/helpers/filterAppsByDisabled.ts b/apps/meteor/client/views/admin/apps/helpers/filterAppsByDisabled.ts
index 7fb22bf5724..c0eca211047 100644
--- a/apps/meteor/client/views/admin/apps/helpers/filterAppsByDisabled.ts
+++ b/apps/meteor/client/views/admin/apps/helpers/filterAppsByDisabled.ts
@@ -1,5 +1,5 @@
 import { appStatusSpanProps } from '../helpers';
-import { App } from '../types';
+import type { App } from '../types';
 
 export const filterAppsByDisabled = (app: App): boolean =>
 	appStatusSpanProps(app)?.label === 'Disabled' ||
diff --git a/apps/meteor/client/views/admin/apps/helpers/filterAppsByEnabled.ts b/apps/meteor/client/views/admin/apps/helpers/filterAppsByEnabled.ts
index a4acad3b605..0f76b933f01 100644
--- a/apps/meteor/client/views/admin/apps/helpers/filterAppsByEnabled.ts
+++ b/apps/meteor/client/views/admin/apps/helpers/filterAppsByEnabled.ts
@@ -1,5 +1,5 @@
 import { appStatusSpanProps } from '../helpers';
-import { App } from '../types';
+import type { App } from '../types';
 
 export const filterAppsByEnabled = (app: App): boolean =>
 	appStatusSpanProps(app)?.label === 'Installed' || appStatusSpanProps(app)?.label === 'Trial period';
diff --git a/apps/meteor/client/views/admin/apps/helpers/filterAppsByFree.ts b/apps/meteor/client/views/admin/apps/helpers/filterAppsByFree.ts
index eebad70f739..75e41d8e07d 100644
--- a/apps/meteor/client/views/admin/apps/helpers/filterAppsByFree.ts
+++ b/apps/meteor/client/views/admin/apps/helpers/filterAppsByFree.ts
@@ -1,3 +1,3 @@
-import { App } from '../types';
+import type { App } from '../types';
 
 export const filterAppsByFree = ({ purchaseType, price }: Partial<App>): boolean => purchaseType === 'buy' && !price;
diff --git a/apps/meteor/client/views/admin/apps/helpers/filterAppsByPaid.ts b/apps/meteor/client/views/admin/apps/helpers/filterAppsByPaid.ts
index a7218433288..2932c1fe470 100644
--- a/apps/meteor/client/views/admin/apps/helpers/filterAppsByPaid.ts
+++ b/apps/meteor/client/views/admin/apps/helpers/filterAppsByPaid.ts
@@ -1,3 +1,3 @@
-import { App } from '../types';
+import type { App } from '../types';
 
 export const filterAppsByPaid = ({ purchaseType, price }: Partial<App>): boolean => purchaseType === 'subscription' || Boolean(price);
diff --git a/apps/meteor/client/views/admin/apps/helpers/installApp.ts b/apps/meteor/client/views/admin/apps/helpers/installApp.ts
index 6c753f16855..c7205566b47 100644
--- a/apps/meteor/client/views/admin/apps/helpers/installApp.ts
+++ b/apps/meteor/client/views/admin/apps/helpers/installApp.ts
@@ -1,4 +1,4 @@
-import { App, AppPermission } from '@rocket.chat/core-typings';
+import type { App, AppPermission } from '@rocket.chat/core-typings';
 
 import { Apps } from '../../../../../app/apps/client/orchestrator';
 import { handleAPIError, warnAppInstall } from '../helpers';
diff --git a/apps/meteor/client/views/admin/apps/helpers/normalizeFeaturedApps.ts b/apps/meteor/client/views/admin/apps/helpers/normalizeFeaturedApps.ts
index 2700f60cbb2..4159f5f342e 100644
--- a/apps/meteor/client/views/admin/apps/helpers/normalizeFeaturedApps.ts
+++ b/apps/meteor/client/views/admin/apps/helpers/normalizeFeaturedApps.ts
@@ -1,5 +1,4 @@
-import { App } from '@rocket.chat/core-typings';
-import type { AppOverview } from '@rocket.chat/core-typings';
+import type { App, AppOverview } from '@rocket.chat/core-typings';
 
 const normalizeFeaturedApps = (appOverviewList: AppOverview[], appsResultItems: App[]): App[] => {
 	const featuredAppsIdList = appOverviewList.map<string>((featuredApp) => featuredApp.latest.id);
diff --git a/apps/meteor/client/views/admin/apps/helpers/updateApp.ts b/apps/meteor/client/views/admin/apps/helpers/updateApp.ts
index f34ed16544f..a86d36ad5de 100644
--- a/apps/meteor/client/views/admin/apps/helpers/updateApp.ts
+++ b/apps/meteor/client/views/admin/apps/helpers/updateApp.ts
@@ -1,4 +1,4 @@
-import { App, AppPermission } from '@rocket.chat/core-typings';
+import type { App, AppPermission } from '@rocket.chat/core-typings';
 
 import { Apps } from '../../../../../app/apps/client/orchestrator';
 import { handleAPIError, warnStatusChange } from '../helpers';
diff --git a/apps/meteor/client/views/admin/apps/hooks/useAppInfo.ts b/apps/meteor/client/views/admin/apps/hooks/useAppInfo.ts
index 435406d0301..44fce08f52b 100644
--- a/apps/meteor/client/views/admin/apps/hooks/useAppInfo.ts
+++ b/apps/meteor/client/views/admin/apps/hooks/useAppInfo.ts
@@ -1,11 +1,11 @@
-import { App } from '@rocket.chat/core-typings';
+import type { App } from '@rocket.chat/core-typings';
 import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useState, useEffect, useContext } from 'react';
 
-import { ISettings } from '../../../../../app/apps/client/@types/IOrchestrator';
+import type { ISettings } from '../../../../../app/apps/client/@types/IOrchestrator';
 import { Apps } from '../../../../../app/apps/client/orchestrator';
 import { AppsContext } from '../AppsContext';
-import { AppInfo } from '../definitions/AppInfo';
+import type { AppInfo } from '../definitions/AppInfo';
 
 const getBundledInApp = async (app: App): Promise<App['bundledIn']> => {
 	const { bundledIn = [] } = app;
diff --git a/apps/meteor/client/views/admin/apps/hooks/useCategories.ts b/apps/meteor/client/views/admin/apps/hooks/useCategories.ts
index 6a1a962bec6..fcffe918a15 100644
--- a/apps/meteor/client/views/admin/apps/hooks/useCategories.ts
+++ b/apps/meteor/client/views/admin/apps/hooks/useCategories.ts
@@ -2,7 +2,7 @@ import { useTranslation } from '@rocket.chat/ui-contexts';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 
 import { Apps } from '../../../../../app/apps/client/orchestrator';
-import {
+import type {
 	CategoryDropDownGroups,
 	CategoryDropdownItem,
 	CategoryDropDownListProps,
diff --git a/apps/meteor/client/views/admin/apps/hooks/useCategoryFlatList.ts b/apps/meteor/client/views/admin/apps/hooks/useCategoryFlatList.ts
index 1671af40d62..f1459b76cbe 100644
--- a/apps/meteor/client/views/admin/apps/hooks/useCategoryFlatList.ts
+++ b/apps/meteor/client/views/admin/apps/hooks/useCategoryFlatList.ts
@@ -1,6 +1,6 @@
 import { useMemo } from 'react';
 
-import { CategoryDropdownItem, CategoryDropDownListProps } from '../definitions/CategoryDropdownDefinitions';
+import type { CategoryDropdownItem, CategoryDropDownListProps } from '../definitions/CategoryDropdownDefinitions';
 
 export const useCategoryFlatList = (data: CategoryDropDownListProps['groups']): CategoryDropdownItem[] =>
 	useMemo(() => data.flatMap((group) => group.items).filter(({ id }) => id !== 'all'), [data]);
diff --git a/apps/meteor/client/views/admin/apps/hooks/useCategoryToggle.ts b/apps/meteor/client/views/admin/apps/hooks/useCategoryToggle.ts
index 3986234e21a..e4678160f46 100644
--- a/apps/meteor/client/views/admin/apps/hooks/useCategoryToggle.ts
+++ b/apps/meteor/client/views/admin/apps/hooks/useCategoryToggle.ts
@@ -1,6 +1,7 @@
-import { Dispatch, SetStateAction, useCallback } from 'react';
+import type { Dispatch, SetStateAction } from 'react';
+import { useCallback } from 'react';
 
-import { CategoryDropdownItem, CategoryDropDownListProps } from '../definitions/CategoryDropdownDefinitions';
+import type { CategoryDropdownItem, CategoryDropDownListProps } from '../definitions/CategoryDropdownDefinitions';
 
 export const useCategoryToggle = (
 	setData: Dispatch<SetStateAction<CategoryDropDownListProps['groups']>>,
diff --git a/apps/meteor/client/views/admin/apps/hooks/useFeaturedApps.ts b/apps/meteor/client/views/admin/apps/hooks/useFeaturedApps.ts
index fb241535cf5..66ddd5761ea 100644
--- a/apps/meteor/client/views/admin/apps/hooks/useFeaturedApps.ts
+++ b/apps/meteor/client/views/admin/apps/hooks/useFeaturedApps.ts
@@ -1,6 +1,7 @@
-import { OperationResult } from '@rocket.chat/rest-typings';
+import type { OperationResult } from '@rocket.chat/rest-typings';
 import { useEndpoint } from '@rocket.chat/ui-contexts';
-import { useQuery, UseQueryResult } from '@tanstack/react-query';
+import type { UseQueryResult } from '@tanstack/react-query';
+import { useQuery } from '@tanstack/react-query';
 
 export const useFeaturedApps = (): UseQueryResult<OperationResult<'GET', '/apps/featured-apps'>> => {
 	const featuredApps = useEndpoint('GET', '/apps/featured-apps');
diff --git a/apps/meteor/client/views/admin/apps/hooks/useFilteredApps.ts b/apps/meteor/client/views/admin/apps/hooks/useFilteredApps.ts
index 8ff62e1dc5f..4be8876ee0a 100644
--- a/apps/meteor/client/views/admin/apps/hooks/useFilteredApps.ts
+++ b/apps/meteor/client/views/admin/apps/hooks/useFilteredApps.ts
@@ -1,7 +1,9 @@
 import type { PaginatedResult } from '@rocket.chat/rest-typings';
-import { useMemo, ContextType } from 'react';
+import type { ContextType } from 'react';
+import { useMemo } from 'react';
 
-import { AsyncState, AsyncStatePhase } from '../../../../lib/asyncState';
+import type { AsyncState } from '../../../../lib/asyncState';
+import { AsyncStatePhase } from '../../../../lib/asyncState';
 import type { AppsContext } from '../AppsContext';
 import { filterAppsByCategories } from '../helpers/filterAppsByCategories';
 import { filterAppsByDisabled } from '../helpers/filterAppsByDisabled';
@@ -11,7 +13,7 @@ import { filterAppsByPaid } from '../helpers/filterAppsByPaid';
 import { filterAppsByText } from '../helpers/filterAppsByText';
 import { sortAppsByAlphabeticalOrInverseOrder } from '../helpers/sortAppsByAlphabeticalOrInverseOrder';
 import { sortAppsByClosestOrFarthestModificationDate } from '../helpers/sortAppsByClosestOrFarthestModificationDate';
-import { App } from '../types';
+import type { App } from '../types';
 
 type appsDataType = ContextType<typeof AppsContext>['installedApps'] | ContextType<typeof AppsContext>['marketplaceApps'];
 
diff --git a/apps/meteor/client/views/admin/apps/hooks/useLogs.ts b/apps/meteor/client/views/admin/apps/hooks/useLogs.ts
index 55d90c0873f..9819d8c20d3 100644
--- a/apps/meteor/client/views/admin/apps/hooks/useLogs.ts
+++ b/apps/meteor/client/views/admin/apps/hooks/useLogs.ts
@@ -1,6 +1,7 @@
-import { OperationResult } from '@rocket.chat/rest-typings';
+import type { OperationResult } from '@rocket.chat/rest-typings';
 import { useEndpoint } from '@rocket.chat/ui-contexts';
-import { useQuery, UseQueryResult } from '@tanstack/react-query';
+import type { UseQueryResult } from '@tanstack/react-query';
+import { useQuery } from '@tanstack/react-query';
 
 export const useLogs = (appId: string): UseQueryResult<OperationResult<'GET', '/apps/:id/logs'>> => {
 	const logs = useEndpoint('GET', `/apps/${appId}/logs`);
diff --git a/apps/meteor/client/views/admin/apps/hooks/useRadioToggle.ts b/apps/meteor/client/views/admin/apps/hooks/useRadioToggle.ts
index 285f09d2405..a509797c832 100644
--- a/apps/meteor/client/views/admin/apps/hooks/useRadioToggle.ts
+++ b/apps/meteor/client/views/admin/apps/hooks/useRadioToggle.ts
@@ -1,6 +1,6 @@
 import { useCallback } from 'react';
 
-import { RadioDropDownItem, RadioDropDownOnSelected, RadioDropDownSetData } from '../definitions/RadioDropDownDefinitions';
+import type { RadioDropDownItem, RadioDropDownOnSelected, RadioDropDownSetData } from '../definitions/RadioDropDownDefinitions';
 
 export const useRadioToggle = (setData: RadioDropDownSetData): RadioDropDownOnSelected => {
 	const onSelected = useCallback(
diff --git a/apps/meteor/client/views/admin/cloud/CloudPage.tsx b/apps/meteor/client/views/admin/cloud/CloudPage.tsx
index 1f2fdce28be..4dfb19ed031 100644
--- a/apps/meteor/client/views/admin/cloud/CloudPage.tsx
+++ b/apps/meteor/client/views/admin/cloud/CloudPage.tsx
@@ -10,7 +10,8 @@ import {
 	useTranslation,
 } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
-import React, { useEffect, ReactNode } from 'react';
+import type { ReactNode } from 'react';
+import React, { useEffect } from 'react';
 
 import Page from '../../../components/Page';
 import ConnectToCloudSection from './ConnectToCloudSection';
diff --git a/apps/meteor/client/views/admin/cloud/CopyStep.tsx b/apps/meteor/client/views/admin/cloud/CopyStep.tsx
index 8fee2853b87..04f344ecd83 100644
--- a/apps/meteor/client/views/admin/cloud/CopyStep.tsx
+++ b/apps/meteor/client/views/admin/cloud/CopyStep.tsx
@@ -1,7 +1,8 @@
 import { Box, Button, Icon, Scrollable, Modal } from '@rocket.chat/fuselage';
 import { useToastMessageDispatch, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
 import Clipboard from 'clipboard';
-import React, { useEffect, useState, useRef, FC } from 'react';
+import type { FC } from 'react';
+import React, { useEffect, useState, useRef } from 'react';
 
 import MarkdownText from '../../../components/MarkdownText';
 import { cloudConsoleUrl } from './constants';
diff --git a/apps/meteor/client/views/admin/cloud/PasteStep.tsx b/apps/meteor/client/views/admin/cloud/PasteStep.tsx
index 897756115ab..d59248ea18a 100644
--- a/apps/meteor/client/views/admin/cloud/PasteStep.tsx
+++ b/apps/meteor/client/views/admin/cloud/PasteStep.tsx
@@ -1,6 +1,7 @@
 import { Box, Button, Scrollable, Throbber, Modal } from '@rocket.chat/fuselage';
 import { useToastMessageDispatch, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ChangeEvent, FC, useState } from 'react';
+import type { ChangeEvent, FC } from 'react';
+import React, { useState } from 'react';
 
 import { queryClient } from '../../../lib/queryClient';
 
diff --git a/apps/meteor/client/views/admin/customEmoji/AddCustomEmoji.tsx b/apps/meteor/client/views/admin/customEmoji/AddCustomEmoji.tsx
index 2e8b629a833..d1a1dbb33ef 100644
--- a/apps/meteor/client/views/admin/customEmoji/AddCustomEmoji.tsx
+++ b/apps/meteor/client/views/admin/customEmoji/AddCustomEmoji.tsx
@@ -1,6 +1,7 @@
 import { Box, Button, ButtonGroup, Margins, TextInput, Field, Icon } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useCallback, useState, ReactElement, ChangeEvent } from 'react';
+import type { ReactElement, ChangeEvent } from 'react';
+import React, { useCallback, useState } from 'react';
 
 import VerticalBar from '../../../components/VerticalBar';
 import { useEndpointUpload } from '../../../hooks/useEndpointUpload';
diff --git a/apps/meteor/client/views/admin/customEmoji/CustomEmoji.tsx b/apps/meteor/client/views/admin/customEmoji/CustomEmoji.tsx
index cb80bbf7d14..2eefba86245 100644
--- a/apps/meteor/client/views/admin/customEmoji/CustomEmoji.tsx
+++ b/apps/meteor/client/views/admin/customEmoji/CustomEmoji.tsx
@@ -1,7 +1,8 @@
 import { Box, Pagination } from '@rocket.chat/fuselage';
 import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, MutableRefObject, useEffect, useMemo, useState } from 'react';
+import type { FC, MutableRefObject } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 
 import FilterByText from '../../../components/FilterByText';
 import {
diff --git a/apps/meteor/client/views/admin/customEmoji/CustomEmojiRoute.tsx b/apps/meteor/client/views/admin/customEmoji/CustomEmojiRoute.tsx
index 84de4c8ac11..d576a61f6f1 100644
--- a/apps/meteor/client/views/admin/customEmoji/CustomEmojiRoute.tsx
+++ b/apps/meteor/client/views/admin/customEmoji/CustomEmojiRoute.tsx
@@ -1,6 +1,7 @@
 import { Button, Icon } from '@rocket.chat/fuselage';
 import { useRoute, useRouteParameter, usePermission, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useCallback, useRef, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useCallback, useRef } from 'react';
 
 import Page from '../../../components/Page';
 import VerticalBar from '../../../components/VerticalBar';
diff --git a/apps/meteor/client/views/admin/customEmoji/EditCustomEmoji.tsx b/apps/meteor/client/views/admin/customEmoji/EditCustomEmoji.tsx
index 938d51fa75d..b2d2e5b4b53 100644
--- a/apps/meteor/client/views/admin/customEmoji/EditCustomEmoji.tsx
+++ b/apps/meteor/client/views/admin/customEmoji/EditCustomEmoji.tsx
@@ -1,6 +1,7 @@
 import { Box, Button, ButtonGroup, Margins, TextInput, Field, Icon, FieldGroup, IconButton } from '@rocket.chat/fuselage';
 import { useSetModal, useToastMessageDispatch, useAbsoluteUrl, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useCallback, useState, useMemo, useEffect, FC, ChangeEvent } from 'react';
+import type { FC, ChangeEvent } from 'react';
+import React, { useCallback, useState, useMemo, useEffect } from 'react';
 
 import GenericModal from '../../../components/GenericModal';
 import VerticalBar from '../../../components/VerticalBar';
diff --git a/apps/meteor/client/views/admin/customEmoji/EditCustomEmojiWithData.tsx b/apps/meteor/client/views/admin/customEmoji/EditCustomEmojiWithData.tsx
index a1eca6f68d5..122a7445412 100644
--- a/apps/meteor/client/views/admin/customEmoji/EditCustomEmojiWithData.tsx
+++ b/apps/meteor/client/views/admin/customEmoji/EditCustomEmojiWithData.tsx
@@ -1,6 +1,7 @@
 import { Box, Button, ButtonGroup, Skeleton, Throbber, InputBox, Callout } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useMemo, FC } from 'react';
+import type { FC } from 'react';
+import React, { useMemo } from 'react';
 
 import { AsyncStatePhase } from '../../../hooks/useAsyncState';
 import { useEndpointData } from '../../../hooks/useEndpointData';
diff --git a/apps/meteor/client/views/admin/customSounds/AddCustomSound.tsx b/apps/meteor/client/views/admin/customSounds/AddCustomSound.tsx
index f8ed3e549e3..56646a59bb4 100644
--- a/apps/meteor/client/views/admin/customSounds/AddCustomSound.tsx
+++ b/apps/meteor/client/views/admin/customSounds/AddCustomSound.tsx
@@ -1,10 +1,12 @@
 import { Field, TextInput, Box, Icon, Margins, Button, ButtonGroup } from '@rocket.chat/fuselage';
 import { useToastMessageDispatch, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useState, useCallback, ReactElement, FormEvent } from 'react';
+import type { ReactElement, FormEvent } from 'react';
+import React, { useState, useCallback } from 'react';
 
 import VerticalBar from '../../../components/VerticalBar';
 import { useFileInput } from '../../../hooks/useFileInput';
-import { validate, createSoundData, soundDataType } from './lib';
+import type { soundDataType } from './lib';
+import { validate, createSoundData } from './lib';
 
 type AddCustomSoundProps = {
 	goToNew: (where: string) => () => void;
diff --git a/apps/meteor/client/views/admin/customSounds/AdminSoundsRoute.tsx b/apps/meteor/client/views/admin/customSounds/AdminSoundsRoute.tsx
index 9c839ce2c81..4603f3d8718 100644
--- a/apps/meteor/client/views/admin/customSounds/AdminSoundsRoute.tsx
+++ b/apps/meteor/client/views/admin/customSounds/AdminSoundsRoute.tsx
@@ -1,7 +1,8 @@
 import { Button, Icon, Pagination } from '@rocket.chat/fuselage';
 import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
 import { useRoute, useRouteParameter, usePermission, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useMemo, useState, useCallback, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo, useState, useCallback } from 'react';
 
 import FilterByText from '../../../components/FilterByText';
 import { GenericTable } from '../../../components/GenericTable/V2/GenericTable';
diff --git a/apps/meteor/client/views/admin/customSounds/CustomSoundRow.tsx b/apps/meteor/client/views/admin/customSounds/CustomSoundRow.tsx
index 5ef39376d4a..58ea40ed6ea 100644
--- a/apps/meteor/client/views/admin/customSounds/CustomSoundRow.tsx
+++ b/apps/meteor/client/views/admin/customSounds/CustomSoundRow.tsx
@@ -1,6 +1,7 @@
 import { Box, IconButton } from '@rocket.chat/fuselage';
 import { useCustomSound, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useCallback, useState, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useCallback, useState } from 'react';
 
 import { GenericTableCell } from '../../../components/GenericTable/V2/GenericTableCell';
 import { GenericTableRow } from '../../../components/GenericTable/V2/GenericTableRow';
diff --git a/apps/meteor/client/views/admin/customSounds/EditCustomSound.tsx b/apps/meteor/client/views/admin/customSounds/EditCustomSound.tsx
index 193f863b9e8..c38bfa50e4d 100644
--- a/apps/meteor/client/views/admin/customSounds/EditCustomSound.tsx
+++ b/apps/meteor/client/views/admin/customSounds/EditCustomSound.tsx
@@ -1,5 +1,6 @@
 import { Box, Button, ButtonGroup, Skeleton, Throbber, InputBox } from '@rocket.chat/fuselage';
-import React, { ReactElement, useMemo } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo } from 'react';
 
 import { AsyncStatePhase } from '../../../hooks/useAsyncState';
 import { useEndpointData } from '../../../hooks/useEndpointData';
diff --git a/apps/meteor/client/views/admin/customSounds/EditSound.tsx b/apps/meteor/client/views/admin/customSounds/EditSound.tsx
index 84126c0cced..38e43b9af5b 100644
--- a/apps/meteor/client/views/admin/customSounds/EditSound.tsx
+++ b/apps/meteor/client/views/admin/customSounds/EditSound.tsx
@@ -1,6 +1,7 @@
 import { Box, Button, ButtonGroup, Margins, TextInput, Field, Icon, IconButton } from '@rocket.chat/fuselage';
 import { useSetModal, useToastMessageDispatch, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useCallback, useState, useMemo, useEffect, ReactElement, SyntheticEvent } from 'react';
+import type { ReactElement, SyntheticEvent } from 'react';
+import React, { useCallback, useState, useMemo, useEffect } from 'react';
 
 import GenericModal from '../../../components/GenericModal';
 import VerticalBar from '../../../components/VerticalBar';
diff --git a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusForm.tsx b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusForm.tsx
index 0b4d23e39ad..e0dcb6d9fca 100644
--- a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusForm.tsx
+++ b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusForm.tsx
@@ -1,7 +1,9 @@
-import { IUserStatus } from '@rocket.chat/core-typings';
-import { Button, ButtonGroup, TextInput, Field, Select, Icon, SelectOption } from '@rocket.chat/fuselage';
+import type { IUserStatus } from '@rocket.chat/core-typings';
+import type { SelectOption } from '@rocket.chat/fuselage';
+import { Button, ButtonGroup, TextInput, Field, Select, Icon } from '@rocket.chat/fuselage';
 import { useSetModal, useRoute, useToastMessageDispatch, useTranslation, useEndpoint } from '@rocket.chat/ui-contexts';
-import React, { useCallback, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useCallback } from 'react';
 import { useForm, Controller } from 'react-hook-form';
 
 import GenericModal from '../../../components/GenericModal';
diff --git a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusFormWithData.tsx b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusFormWithData.tsx
index eb6cdd61a0d..f5e9afcc3f8 100644
--- a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusFormWithData.tsx
+++ b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusFormWithData.tsx
@@ -1,7 +1,8 @@
-import { IUserStatus } from '@rocket.chat/core-typings';
+import type { IUserStatus } from '@rocket.chat/core-typings';
 import { Box, Button, ButtonGroup, Skeleton, Throbber, InputBox, Callout } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useMemo, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo } from 'react';
 
 import { AsyncStatePhase } from '../../../hooks/useAsyncState';
 import { useEndpointData } from '../../../hooks/useEndpointData';
diff --git a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusRoute.tsx b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusRoute.tsx
index 87c78ad2193..82953892c39 100644
--- a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusRoute.tsx
+++ b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusRoute.tsx
@@ -1,6 +1,7 @@
 import { Button, Icon } from '@rocket.chat/fuselage';
 import { useRoute, useRouteParameter, usePermission, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useCallback, useRef, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useCallback, useRef } from 'react';
 
 import Page from '../../../components/Page';
 import VerticalBar from '../../../components/VerticalBar';
diff --git a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusTable/CustomUserStatusRow.tsx b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusTable/CustomUserStatusRow.tsx
index 958f51f5ad2..179071c7bff 100644
--- a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusTable/CustomUserStatusRow.tsx
+++ b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusTable/CustomUserStatusRow.tsx
@@ -1,6 +1,7 @@
-import { IUserStatus } from '@rocket.chat/core-typings';
+import type { IUserStatus } from '@rocket.chat/core-typings';
 import { TableRow, TableCell } from '@rocket.chat/fuselage';
-import React, { CSSProperties, ReactElement } from 'react';
+import type { CSSProperties, ReactElement } from 'react';
+import React from 'react';
 
 import MarkdownText from '../../../../components/MarkdownText';
 
diff --git a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusTable/CustomUserStatusTable.tsx b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusTable/CustomUserStatusTable.tsx
index ef0169704b8..541fb8b0e79 100644
--- a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusTable/CustomUserStatusTable.tsx
+++ b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusTable/CustomUserStatusTable.tsx
@@ -1,7 +1,8 @@
 import { States, StatesIcon, StatesTitle, Pagination } from '@rocket.chat/fuselage';
 import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useState, useMemo, MutableRefObject, useEffect } from 'react';
+import type { ReactElement, MutableRefObject } from 'react';
+import React, { useState, useMemo, useEffect } from 'react';
 
 import FilterByText from '../../../../components/FilterByText';
 import {
diff --git a/apps/meteor/client/views/admin/emailInbox/EmailInboxForm.tsx b/apps/meteor/client/views/admin/emailInbox/EmailInboxForm.tsx
index 0419bda8473..1ed8b9d19cc 100644
--- a/apps/meteor/client/views/admin/emailInbox/EmailInboxForm.tsx
+++ b/apps/meteor/client/views/admin/emailInbox/EmailInboxForm.tsx
@@ -1,4 +1,4 @@
-import { IEmailInboxPayload } from '@rocket.chat/core-typings';
+import type { IEmailInboxPayload } from '@rocket.chat/core-typings';
 import {
 	Accordion,
 	Button,
@@ -15,7 +15,8 @@ import {
 } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useSetModal, useToastMessageDispatch, useRoute, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useCallback, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useCallback } from 'react';
 import { useForm, Controller } from 'react-hook-form';
 
 import { validateEmail } from '../../../../lib/emailValidator';
diff --git a/apps/meteor/client/views/admin/emailInbox/EmailInboxFormWithData.tsx b/apps/meteor/client/views/admin/emailInbox/EmailInboxFormWithData.tsx
index bb0a8b1d191..393dccbc992 100644
--- a/apps/meteor/client/views/admin/emailInbox/EmailInboxFormWithData.tsx
+++ b/apps/meteor/client/views/admin/emailInbox/EmailInboxFormWithData.tsx
@@ -1,8 +1,9 @@
-import { IEmailInbox } from '@rocket.chat/core-typings';
+import type { IEmailInbox } from '@rocket.chat/core-typings';
 import { States, StatesIcon, StatesTitle } from '@rocket.chat/fuselage';
 import { useTranslation, useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { FormSkeleton } from '../../../components/Skeleton';
 import EmailInboxForm from './EmailInboxForm';
diff --git a/apps/meteor/client/views/admin/emailInbox/EmailInboxPage.tsx b/apps/meteor/client/views/admin/emailInbox/EmailInboxPage.tsx
index a52756d54d8..b068f00c1dd 100644
--- a/apps/meteor/client/views/admin/emailInbox/EmailInboxPage.tsx
+++ b/apps/meteor/client/views/admin/emailInbox/EmailInboxPage.tsx
@@ -1,6 +1,7 @@
 import { Button, Icon } from '@rocket.chat/fuselage';
 import { useRoute, useRouteParameter, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import Page from '../../../components/Page';
 import EmailInboxForm from './EmailInboxForm';
diff --git a/apps/meteor/client/views/admin/emailInbox/EmailInboxRoute.tsx b/apps/meteor/client/views/admin/emailInbox/EmailInboxRoute.tsx
index bf2f811aafe..7361d13b10c 100644
--- a/apps/meteor/client/views/admin/emailInbox/EmailInboxRoute.tsx
+++ b/apps/meteor/client/views/admin/emailInbox/EmailInboxRoute.tsx
@@ -1,5 +1,6 @@
 import { usePermission } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 import EmailInboxPage from './EmailInboxPage';
diff --git a/apps/meteor/client/views/admin/emailInbox/EmailInboxTable.tsx b/apps/meteor/client/views/admin/emailInbox/EmailInboxTable.tsx
index a9f991837de..990d2df402d 100644
--- a/apps/meteor/client/views/admin/emailInbox/EmailInboxTable.tsx
+++ b/apps/meteor/client/views/admin/emailInbox/EmailInboxTable.tsx
@@ -1,6 +1,7 @@
 import { Pagination, States, StatesIcon, StatesTitle } from '@rocket.chat/fuselage';
 import { useRoute, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useMemo, useCallback, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo, useCallback } from 'react';
 
 import {
 	GenericTable,
diff --git a/apps/meteor/client/views/admin/emailInbox/SendTestButton.tsx b/apps/meteor/client/views/admin/emailInbox/SendTestButton.tsx
index bc2b76e063b..f3ea0a7fa08 100644
--- a/apps/meteor/client/views/admin/emailInbox/SendTestButton.tsx
+++ b/apps/meteor/client/views/admin/emailInbox/SendTestButton.tsx
@@ -1,7 +1,8 @@
-import { IEmailInboxPayload } from '@rocket.chat/core-typings';
+import type { IEmailInboxPayload } from '@rocket.chat/core-typings';
 import { Box, Button, TableCell, Icon } from '@rocket.chat/fuselage';
 import { useToastMessageDispatch, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 const SendTestButton = ({ id }: { id: IEmailInboxPayload['_id'] }): ReactElement => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/admin/federationDashboard/FederationDashboardPage.stories.tsx b/apps/meteor/client/views/admin/federationDashboard/FederationDashboardPage.stories.tsx
index 7ae54f9c542..381f99d8e0d 100644
--- a/apps/meteor/client/views/admin/federationDashboard/FederationDashboardPage.stories.tsx
+++ b/apps/meteor/client/views/admin/federationDashboard/FederationDashboardPage.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import FederationDashboardPage from './FederationDashboardPage';
diff --git a/apps/meteor/client/views/admin/federationDashboard/FederationDashboardPage.tsx b/apps/meteor/client/views/admin/federationDashboard/FederationDashboardPage.tsx
index 03f0b7b3e85..43d517fee43 100644
--- a/apps/meteor/client/views/admin/federationDashboard/FederationDashboardPage.tsx
+++ b/apps/meteor/client/views/admin/federationDashboard/FederationDashboardPage.tsx
@@ -1,6 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import Page from '../../../components/Page';
 import OverviewSection from './OverviewSection';
diff --git a/apps/meteor/client/views/admin/federationDashboard/FederationDashboardRoute.tsx b/apps/meteor/client/views/admin/federationDashboard/FederationDashboardRoute.tsx
index 1cd7c867806..abfdeec4683 100644
--- a/apps/meteor/client/views/admin/federationDashboard/FederationDashboardRoute.tsx
+++ b/apps/meteor/client/views/admin/federationDashboard/FederationDashboardRoute.tsx
@@ -1,5 +1,6 @@
 import { useRole } from '@rocket.chat/ui-contexts';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 import FederationDashboardPage from './FederationDashboardPage';
diff --git a/apps/meteor/client/views/admin/federationDashboard/OverviewSection.stories.tsx b/apps/meteor/client/views/admin/federationDashboard/OverviewSection.stories.tsx
index b30a4514df2..0e849c9a6ee 100644
--- a/apps/meteor/client/views/admin/federationDashboard/OverviewSection.stories.tsx
+++ b/apps/meteor/client/views/admin/federationDashboard/OverviewSection.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import OverviewSection from './OverviewSection';
diff --git a/apps/meteor/client/views/admin/federationDashboard/OverviewSection.tsx b/apps/meteor/client/views/admin/federationDashboard/OverviewSection.tsx
index cb84f0cd811..10bc5c3b865 100644
--- a/apps/meteor/client/views/admin/federationDashboard/OverviewSection.tsx
+++ b/apps/meteor/client/views/admin/federationDashboard/OverviewSection.tsx
@@ -1,7 +1,8 @@
 import { Box, Skeleton } from '@rocket.chat/fuselage';
 import { useMethod, useTranslation } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
-import React, { ReactElement, ReactNode } from 'react';
+import type { ReactElement, ReactNode } from 'react';
+import React from 'react';
 
 import CounterSet from '../../../components/dataView/CounterSet';
 
diff --git a/apps/meteor/client/views/admin/federationDashboard/ServersSection.stories.tsx b/apps/meteor/client/views/admin/federationDashboard/ServersSection.stories.tsx
index 50037f48358..1d0eecc9e63 100644
--- a/apps/meteor/client/views/admin/federationDashboard/ServersSection.stories.tsx
+++ b/apps/meteor/client/views/admin/federationDashboard/ServersSection.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import ServersSection from './ServersSection';
diff --git a/apps/meteor/client/views/admin/federationDashboard/ServersSection.tsx b/apps/meteor/client/views/admin/federationDashboard/ServersSection.tsx
index d591008c91a..381a86fb82b 100644
--- a/apps/meteor/client/views/admin/federationDashboard/ServersSection.tsx
+++ b/apps/meteor/client/views/admin/federationDashboard/ServersSection.tsx
@@ -1,7 +1,8 @@
 import { Box, Throbber } from '@rocket.chat/fuselage';
 import { useMethod } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 function ServersSection(): ReactElement | null {
 	const getFederationServers = useMethod('federation:getServers');
diff --git a/apps/meteor/client/views/admin/import/ImportHistoryPage.stories.tsx b/apps/meteor/client/views/admin/import/ImportHistoryPage.stories.tsx
index bae94ed6c0d..4ef9821ceba 100644
--- a/apps/meteor/client/views/admin/import/ImportHistoryPage.stories.tsx
+++ b/apps/meteor/client/views/admin/import/ImportHistoryPage.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import ImportHistoryPage from './ImportHistoryPage';
diff --git a/apps/meteor/client/views/admin/import/ImportOperationSummary.stories.tsx b/apps/meteor/client/views/admin/import/ImportOperationSummary.stories.tsx
index a9a74c5d666..0e41058b5f9 100644
--- a/apps/meteor/client/views/admin/import/ImportOperationSummary.stories.tsx
+++ b/apps/meteor/client/views/admin/import/ImportOperationSummary.stories.tsx
@@ -1,5 +1,5 @@
 import { Table } from '@rocket.chat/fuselage';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import ImportOperationSummary from './ImportOperationSummary';
diff --git a/apps/meteor/client/views/admin/import/NewImportPage.stories.tsx b/apps/meteor/client/views/admin/import/NewImportPage.stories.tsx
index 7f0677f45d8..4285ac1f50a 100644
--- a/apps/meteor/client/views/admin/import/NewImportPage.stories.tsx
+++ b/apps/meteor/client/views/admin/import/NewImportPage.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import NewImportPage from './NewImportPage';
diff --git a/apps/meteor/client/views/admin/import/PrepareChannels.tsx b/apps/meteor/client/views/admin/import/PrepareChannels.tsx
index 7c1e8d2da27..c07e76b2dd8 100644
--- a/apps/meteor/client/views/admin/import/PrepareChannels.tsx
+++ b/apps/meteor/client/views/admin/import/PrepareChannels.tsx
@@ -1,6 +1,7 @@
 import { CheckBox, Table, Tag, Pagination } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useState, useCallback, FC, Dispatch, SetStateAction, ChangeEvent } from 'react';
+import type { FC, Dispatch, SetStateAction, ChangeEvent } from 'react';
+import React, { useState, useCallback } from 'react';
 
 type ChannelDescriptor = {
 	channel_id: string;
diff --git a/apps/meteor/client/views/admin/import/PrepareUsers.tsx b/apps/meteor/client/views/admin/import/PrepareUsers.tsx
index b909b3bb66a..cb7b3dae9c4 100644
--- a/apps/meteor/client/views/admin/import/PrepareUsers.tsx
+++ b/apps/meteor/client/views/admin/import/PrepareUsers.tsx
@@ -1,6 +1,7 @@
 import { CheckBox, Table, Tag, Pagination } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useState, useCallback, FC, Dispatch, SetStateAction, ChangeEvent } from 'react';
+import type { FC, Dispatch, SetStateAction, ChangeEvent } from 'react';
+import React, { useState, useCallback } from 'react';
 
 type UserDescriptor = {
 	user_id: string;
diff --git a/apps/meteor/client/views/admin/info/DeploymentCard.stories.tsx b/apps/meteor/client/views/admin/info/DeploymentCard.stories.tsx
index 9d18614d0e0..c591d920604 100644
--- a/apps/meteor/client/views/admin/info/DeploymentCard.stories.tsx
+++ b/apps/meteor/client/views/admin/info/DeploymentCard.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import DeploymentCard from './DeploymentCard';
diff --git a/apps/meteor/client/views/admin/info/DeploymentCard.tsx b/apps/meteor/client/views/admin/info/DeploymentCard.tsx
index 65026914591..2181e6183f9 100644
--- a/apps/meteor/client/views/admin/info/DeploymentCard.tsx
+++ b/apps/meteor/client/views/admin/info/DeploymentCard.tsx
@@ -3,7 +3,8 @@ import { ButtonGroup, Button } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { Card } from '@rocket.chat/ui-client';
 import { useSetModal, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { memo, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { memo } from 'react';
 
 import { useFormatDateAndTime } from '../../../hooks/useFormatDateAndTime';
 import InstancesModal from './InstancesModal';
diff --git a/apps/meteor/client/views/admin/info/DescriptionList.stories.tsx b/apps/meteor/client/views/admin/info/DescriptionList.stories.tsx
index 557840416c3..3cbf89db64b 100644
--- a/apps/meteor/client/views/admin/info/DescriptionList.stories.tsx
+++ b/apps/meteor/client/views/admin/info/DescriptionList.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import DescriptionList from './DescriptionList';
diff --git a/apps/meteor/client/views/admin/info/Feature.stories.tsx b/apps/meteor/client/views/admin/info/Feature.stories.tsx
index 0795161343e..0f1606d730a 100644
--- a/apps/meteor/client/views/admin/info/Feature.stories.tsx
+++ b/apps/meteor/client/views/admin/info/Feature.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import Feature from './Feature';
diff --git a/apps/meteor/client/views/admin/info/FederationCard/FederationCard.tsx b/apps/meteor/client/views/admin/info/FederationCard/FederationCard.tsx
index e99c4864093..fa5e29849fc 100644
--- a/apps/meteor/client/views/admin/info/FederationCard/FederationCard.tsx
+++ b/apps/meteor/client/views/admin/info/FederationCard/FederationCard.tsx
@@ -2,7 +2,8 @@ import { Box, Button, ButtonGroup, ToggleSwitch } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { Card } from '@rocket.chat/ui-client';
 import { useSetModal, useSetting, useSettingSetValue, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import SettingsProvider from '../../../../providers/SettingsProvider';
 import { CardHeader, Section } from './components';
diff --git a/apps/meteor/client/views/admin/info/FederationCard/components/CardHeader.tsx b/apps/meteor/client/views/admin/info/FederationCard/components/CardHeader.tsx
index 8eca8586e2c..192d9fb7790 100644
--- a/apps/meteor/client/views/admin/info/FederationCard/components/CardHeader.tsx
+++ b/apps/meteor/client/views/admin/info/FederationCard/components/CardHeader.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 const CardHeader: FC = ({ children }) => (
 	<Box display='flex' flexDirection='row' color='default' justifyContent='space-between'>
diff --git a/apps/meteor/client/views/admin/info/FederationCard/components/FederationModal/DNSRecordItem.tsx b/apps/meteor/client/views/admin/info/FederationCard/components/FederationModal/DNSRecordItem.tsx
index d84e2708f0c..43791921024 100644
--- a/apps/meteor/client/views/admin/info/FederationCard/components/FederationModal/DNSRecordItem.tsx
+++ b/apps/meteor/client/views/admin/info/FederationCard/components/FederationModal/DNSRecordItem.tsx
@@ -1,9 +1,10 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import { SectionStatus } from '../Section';
 import getStatusIcon from '../SectionStatusIcon';
-import { DNSRecord } from './Types';
+import type { DNSRecord } from './Types';
 
 export const DNSRecordItem: FC<{
 	record: DNSRecord;
diff --git a/apps/meteor/client/views/admin/info/FederationCard/components/FederationModal/DNSRecords.tsx b/apps/meteor/client/views/admin/info/FederationCard/components/FederationModal/DNSRecords.tsx
index dbf989655d1..15961aa8914 100644
--- a/apps/meteor/client/views/admin/info/FederationCard/components/FederationModal/DNSRecords.tsx
+++ b/apps/meteor/client/views/admin/info/FederationCard/components/FederationModal/DNSRecords.tsx
@@ -1,12 +1,14 @@
 import { Box } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import _ from 'lodash';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import { SectionStatus } from '../Section';
 import { DNSRecordItem } from './DNSRecordItem';
 import { DNSText } from './DNSText';
-import { DNSRecord, DNSRecordName, DNSRecordType, ResolvedDNS, TXTRecordValue } from './Types';
+import type { DNSRecord, ResolvedDNS } from './Types';
+import { DNSRecordName, DNSRecordType, TXTRecordValue } from './Types';
 
 export const DNSRecords: FC<{
 	federationSubdomain: string;
diff --git a/apps/meteor/client/views/admin/info/FederationCard/components/FederationModal/DNSText.tsx b/apps/meteor/client/views/admin/info/FederationCard/components/FederationModal/DNSText.tsx
index b8f181ce617..f47586d98a9 100644
--- a/apps/meteor/client/views/admin/info/FederationCard/components/FederationModal/DNSText.tsx
+++ b/apps/meteor/client/views/admin/info/FederationCard/components/FederationModal/DNSText.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 export const DNSText: FC<{
 	text: string;
diff --git a/apps/meteor/client/views/admin/info/FederationCard/components/FederationModal/FederationModal.tsx b/apps/meteor/client/views/admin/info/FederationCard/components/FederationModal/FederationModal.tsx
index 0867578ee53..75900a2911c 100644
--- a/apps/meteor/client/views/admin/info/FederationCard/components/FederationModal/FederationModal.tsx
+++ b/apps/meteor/client/views/admin/info/FederationCard/components/FederationModal/FederationModal.tsx
@@ -1,13 +1,17 @@
-import { Box, Button, Field, FieldGroup, Modal, Select, SelectOption, Tabs, TextInput } from '@rocket.chat/fuselage';
+import type { SelectOption } from '@rocket.chat/fuselage';
+import { Box, Button, Field, FieldGroup, Modal, Select, Tabs, TextInput } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useSetting, useSettingSetValue, useTranslation } from '@rocket.chat/ui-contexts';
-import { parse as parseDomain, ParsedDomain } from 'psl';
-import React, { FC, ReactElement, useCallback, useState } from 'react';
+import type { ParsedDomain } from 'psl';
+import { parse as parseDomain } from 'psl';
+import type { FC, ReactElement } from 'react';
+import React, { useCallback, useState } from 'react';
 
 import { useForm } from '../../../../../../hooks/useForm';
 import { DNSRecords } from './DNSRecords';
 import InviteUsers from './InviteUsers';
-import { DNSRecordName, ResolvedDNS, TXTRecordValue } from './Types';
+import type { DNSRecordName, ResolvedDNS } from './Types';
+import { TXTRecordValue } from './Types';
 
 export const FederationModal: FC<{ onClose: () => void }> = ({ onClose, ...props }): ReactElement => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/admin/info/FederationCard/components/FederationModal/InviteUsers.tsx b/apps/meteor/client/views/admin/info/FederationCard/components/FederationModal/InviteUsers.tsx
index 6c425b25f0d..ab25cf7fd69 100644
--- a/apps/meteor/client/views/admin/info/FederationCard/components/FederationModal/InviteUsers.tsx
+++ b/apps/meteor/client/views/admin/info/FederationCard/components/FederationModal/InviteUsers.tsx
@@ -1,6 +1,7 @@
 import { Box, ButtonGroup, Button, Banner } from '@rocket.chat/fuselage';
 import { useRoute, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, ReactElement } from 'react';
+import type { FC, ReactElement } from 'react';
+import React from 'react';
 
 const InviteUsers: FC<{ onClose: () => void }> = ({ onClose }): ReactElement => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/admin/info/FederationCard/components/FederationModal/Types.ts b/apps/meteor/client/views/admin/info/FederationCard/components/FederationModal/Types.ts
index cf609f60d2e..9bdaf131f4e 100644
--- a/apps/meteor/client/views/admin/info/FederationCard/components/FederationModal/Types.ts
+++ b/apps/meteor/client/views/admin/info/FederationCard/components/FederationModal/Types.ts
@@ -1,4 +1,4 @@
-import { SectionStatus } from '../Section';
+import type { SectionStatus } from '../Section';
 
 export enum DNSRecordType {
 	SRV = 'srv',
diff --git a/apps/meteor/client/views/admin/info/FederationCard/components/Section.tsx b/apps/meteor/client/views/admin/info/FederationCard/components/Section.tsx
index 6e200b3ce05..7b005771e08 100644
--- a/apps/meteor/client/views/admin/info/FederationCard/components/Section.tsx
+++ b/apps/meteor/client/views/admin/info/FederationCard/components/Section.tsx
@@ -1,6 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
 import { Card } from '@rocket.chat/ui-client';
-import React, { FC, memo } from 'react';
+import type { FC } from 'react';
+import React, { memo } from 'react';
 
 import getStatusIcon from './SectionStatusIcon';
 
diff --git a/apps/meteor/client/views/admin/info/FederationCard/components/SectionStatusIcon.tsx b/apps/meteor/client/views/admin/info/FederationCard/components/SectionStatusIcon.tsx
index 8a0c2b6a92b..6f925f78f89 100644
--- a/apps/meteor/client/views/admin/info/FederationCard/components/SectionStatusIcon.tsx
+++ b/apps/meteor/client/views/admin/info/FederationCard/components/SectionStatusIcon.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { SectionStatus } from './Section';
 
diff --git a/apps/meteor/client/views/admin/info/InformationPage.stories.tsx b/apps/meteor/client/views/admin/info/InformationPage.stories.tsx
index abfc4225249..b5c91798d5f 100644
--- a/apps/meteor/client/views/admin/info/InformationPage.stories.tsx
+++ b/apps/meteor/client/views/admin/info/InformationPage.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import InformationPage from './InformationPage';
diff --git a/apps/meteor/client/views/admin/info/InformationRoute.tsx b/apps/meteor/client/views/admin/info/InformationRoute.tsx
index acc03724eb6..cdc31cfde83 100644
--- a/apps/meteor/client/views/admin/info/InformationRoute.tsx
+++ b/apps/meteor/client/views/admin/info/InformationRoute.tsx
@@ -1,7 +1,8 @@
 import type { IInstanceStatus, IStats } from '@rocket.chat/core-typings';
 import { Callout, ButtonGroup, Button, Icon } from '@rocket.chat/fuselage';
 import { usePermission, useServerInformation, useEndpoint, useTranslation, useMethod } from '@rocket.chat/ui-contexts';
-import React, { useState, useEffect, memo, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useState, useEffect, memo } from 'react';
 
 import Page from '../../../components/Page';
 import PageSkeleton from '../../../components/PageSkeleton';
diff --git a/apps/meteor/client/views/admin/info/InstancesModal.stories.tsx b/apps/meteor/client/views/admin/info/InstancesModal.stories.tsx
index 6b72bcccdfb..53c36fbc172 100644
--- a/apps/meteor/client/views/admin/info/InstancesModal.stories.tsx
+++ b/apps/meteor/client/views/admin/info/InstancesModal.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import InstancesModal from './InstancesModal';
diff --git a/apps/meteor/client/views/admin/info/LicenseCard.stories.tsx b/apps/meteor/client/views/admin/info/LicenseCard.stories.tsx
index a0fd4b297dd..929a3c8f04d 100644
--- a/apps/meteor/client/views/admin/info/LicenseCard.stories.tsx
+++ b/apps/meteor/client/views/admin/info/LicenseCard.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import LicenseCard from './LicenseCard';
diff --git a/apps/meteor/client/views/admin/info/LicenseCard.tsx b/apps/meteor/client/views/admin/info/LicenseCard.tsx
index d92f912e26d..177db8fb583 100644
--- a/apps/meteor/client/views/admin/info/LicenseCard.tsx
+++ b/apps/meteor/client/views/admin/info/LicenseCard.tsx
@@ -2,7 +2,8 @@ import { ButtonGroup, Button, Skeleton, Margins } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { Card } from '@rocket.chat/ui-client';
 import { useSetModal, useSetting, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import PlanTag from '../../../components/PlanTag';
 import { useLicense } from '../../../hooks/useLicense';
diff --git a/apps/meteor/client/views/admin/info/OfflineLicenseModal.stories.tsx b/apps/meteor/client/views/admin/info/OfflineLicenseModal.stories.tsx
index ae344eb609c..74e69f7bdf7 100644
--- a/apps/meteor/client/views/admin/info/OfflineLicenseModal.stories.tsx
+++ b/apps/meteor/client/views/admin/info/OfflineLicenseModal.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import { screen, userEvent } from '@storybook/testing-library';
 import React from 'react';
 
diff --git a/apps/meteor/client/views/admin/info/OfflineLicenseModal.tsx b/apps/meteor/client/views/admin/info/OfflineLicenseModal.tsx
index 6a2377647db..de427c26bc3 100644
--- a/apps/meteor/client/views/admin/info/OfflineLicenseModal.tsx
+++ b/apps/meteor/client/views/admin/info/OfflineLicenseModal.tsx
@@ -1,7 +1,8 @@
 import { Modal, Box, ButtonGroup, Button, Scrollable, Callout, Margins, Icon } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useEndpoint, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ComponentProps, FormEvent, ReactElement, useState } from 'react';
+import type { ComponentProps, FormEvent, ReactElement } from 'react';
+import React, { useState } from 'react';
 
 import { queryClient } from '../../../lib/queryClient';
 
diff --git a/apps/meteor/client/views/admin/info/UsageCard.stories.tsx b/apps/meteor/client/views/admin/info/UsageCard.stories.tsx
index 64386f99cae..2081987efeb 100644
--- a/apps/meteor/client/views/admin/info/UsageCard.stories.tsx
+++ b/apps/meteor/client/views/admin/info/UsageCard.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import UsageCard from './UsageCard';
diff --git a/apps/meteor/client/views/admin/info/UsageCard.tsx b/apps/meteor/client/views/admin/info/UsageCard.tsx
index 448728003e4..43d169cf68b 100644
--- a/apps/meteor/client/views/admin/info/UsageCard.tsx
+++ b/apps/meteor/client/views/admin/info/UsageCard.tsx
@@ -3,7 +3,8 @@ import { ButtonGroup, Button } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { TextSeparator, Card } from '@rocket.chat/ui-client';
 import { useRoute, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { memo, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { memo } from 'react';
 
 import { useHasLicenseModule } from '../../../../ee/client/hooks/useHasLicenseModule';
 import { UserStatus } from '../../../components/UserStatus';
diff --git a/apps/meteor/client/views/admin/info/UsagePieGraph.stories.tsx b/apps/meteor/client/views/admin/info/UsagePieGraph.stories.tsx
index 2ca5cef1f5f..12f211d47c5 100644
--- a/apps/meteor/client/views/admin/info/UsagePieGraph.stories.tsx
+++ b/apps/meteor/client/views/admin/info/UsagePieGraph.stories.tsx
@@ -1,6 +1,7 @@
 import colorTokens from '@rocket.chat/fuselage-tokens/colors.json';
-import { ComponentMeta, ComponentStory, Story } from '@storybook/react';
-import React, { ComponentProps } from 'react';
+import type { ComponentMeta, ComponentStory, Story } from '@storybook/react';
+import type { ComponentProps } from 'react';
+import React from 'react';
 
 import { useAutoSequence } from '../../../stories/hooks/useAutoSequence';
 import UsagePieGraph from './UsagePieGraph';
diff --git a/apps/meteor/client/views/admin/info/UsagePieGraph.tsx b/apps/meteor/client/views/admin/info/UsagePieGraph.tsx
index 9fe46da3a17..9ed618f8a98 100644
--- a/apps/meteor/client/views/admin/info/UsagePieGraph.tsx
+++ b/apps/meteor/client/views/admin/info/UsagePieGraph.tsx
@@ -1,7 +1,9 @@
-import { Pie, DatumId } from '@nivo/pie';
+import type { DatumId } from '@nivo/pie';
+import { Pie } from '@nivo/pie';
 import { Box } from '@rocket.chat/fuselage';
 import colors from '@rocket.chat/fuselage-tokens/colors';
-import React, { useMemo, useCallback, ReactElement, CSSProperties, ReactNode } from 'react';
+import type { ReactElement, CSSProperties, ReactNode } from 'react';
+import React, { useMemo, useCallback } from 'react';
 
 import { useLocalePercentage } from '../../../hooks/useLocalePercentage';
 
diff --git a/apps/meteor/client/views/admin/integrations/IntegrationsPage.tsx b/apps/meteor/client/views/admin/integrations/IntegrationsPage.tsx
index ea681433c53..2fdcad45e91 100644
--- a/apps/meteor/client/views/admin/integrations/IntegrationsPage.tsx
+++ b/apps/meteor/client/views/admin/integrations/IntegrationsPage.tsx
@@ -1,6 +1,7 @@
 import { Button, ButtonGroup, Icon, Tabs } from '@rocket.chat/fuselage';
 import { useRoute, useRouteParameter, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useCallback, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useCallback } from 'react';
 
 import Page from '../../../components/Page';
 import IntegrationsTable from './IntegrationsTable';
diff --git a/apps/meteor/client/views/admin/integrations/edit/HistoryContent.tsx b/apps/meteor/client/views/admin/integrations/edit/HistoryContent.tsx
index 24438393c3a..e88efa0bdf0 100644
--- a/apps/meteor/client/views/admin/integrations/edit/HistoryContent.tsx
+++ b/apps/meteor/client/views/admin/integrations/edit/HistoryContent.tsx
@@ -1,7 +1,8 @@
-import { IIntegrationHistory, Serialized } from '@rocket.chat/core-typings';
+import type { IIntegrationHistory, Serialized } from '@rocket.chat/core-typings';
 import { Skeleton, Box, Accordion } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import HistoryItem from './HistoryItem';
 
diff --git a/apps/meteor/client/views/admin/integrations/edit/OutgoingWebhookHistoryPage.tsx b/apps/meteor/client/views/admin/integrations/edit/OutgoingWebhookHistoryPage.tsx
index 1597e04d50c..3005356d179 100644
--- a/apps/meteor/client/views/admin/integrations/edit/OutgoingWebhookHistoryPage.tsx
+++ b/apps/meteor/client/views/admin/integrations/edit/OutgoingWebhookHistoryPage.tsx
@@ -2,7 +2,8 @@ import { Button, ButtonGroup, Icon, Pagination } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useToastMessageDispatch, useRoute, useRouteParameter, useMethod, useTranslation, useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery, useQueryClient } from '@tanstack/react-query';
-import React, { useMemo, ReactElement, useState, useEffect, ComponentProps } from 'react';
+import type { ReactElement, ComponentProps } from 'react';
+import React, { useMemo, useState, useEffect } from 'react';
 
 import { integrationHistoryStreamer } from '../../../../../app/integrations/client/streamer';
 import { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
diff --git a/apps/meteor/client/views/admin/invites/InviteRow.tsx b/apps/meteor/client/views/admin/invites/InviteRow.tsx
index c18bb47ffee..9e0b6c696df 100644
--- a/apps/meteor/client/views/admin/invites/InviteRow.tsx
+++ b/apps/meteor/client/views/admin/invites/InviteRow.tsx
@@ -2,7 +2,8 @@ import type { IInvite } from '@rocket.chat/core-typings';
 import { Box, IconButton } from '@rocket.chat/fuselage';
 import { useMediaQuery } from '@rocket.chat/fuselage-hooks';
 import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, MouseEvent } from 'react';
+import type { ReactElement, MouseEvent } from 'react';
+import React from 'react';
 
 import { GenericTableCell, GenericTableRow } from '../../../components/GenericTable';
 import { useFormatDateAndTime } from '../../../hooks/useFormatDateAndTime';
diff --git a/apps/meteor/client/views/admin/invites/InvitesPage.tsx b/apps/meteor/client/views/admin/invites/InvitesPage.tsx
index 3599e685b56..442b38bde8f 100644
--- a/apps/meteor/client/views/admin/invites/InvitesPage.tsx
+++ b/apps/meteor/client/views/admin/invites/InvitesPage.tsx
@@ -1,6 +1,7 @@
 import { useMediaQuery } from '@rocket.chat/fuselage-hooks';
 import { useSetModal, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import GenericModal from '../../../components/GenericModal';
 import {
diff --git a/apps/meteor/client/views/admin/invites/InvitesRoute.tsx b/apps/meteor/client/views/admin/invites/InvitesRoute.tsx
index 8ba880b55de..cb05b33757e 100644
--- a/apps/meteor/client/views/admin/invites/InvitesRoute.tsx
+++ b/apps/meteor/client/views/admin/invites/InvitesRoute.tsx
@@ -1,5 +1,6 @@
 import { usePermission } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 import InvitesPage from './InvitesPage';
diff --git a/apps/meteor/client/views/admin/mailer/Mailer.stories.tsx b/apps/meteor/client/views/admin/mailer/Mailer.stories.tsx
index ba2168a3215..f616a4f1d5b 100644
--- a/apps/meteor/client/views/admin/mailer/Mailer.stories.tsx
+++ b/apps/meteor/client/views/admin/mailer/Mailer.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import { Mailer } from './Mailer';
diff --git a/apps/meteor/client/views/admin/mailer/Mailer.tsx b/apps/meteor/client/views/admin/mailer/Mailer.tsx
index e594ad24536..9349e4bfa22 100644
--- a/apps/meteor/client/views/admin/mailer/Mailer.tsx
+++ b/apps/meteor/client/views/admin/mailer/Mailer.tsx
@@ -1,11 +1,12 @@
 import { TextInput, TextAreaInput, Field, FieldGroup, CheckBox, Button, Icon, ButtonGroup } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useState, useCallback, SyntheticEvent, ReactElement } from 'react';
+import type { SyntheticEvent, ReactElement } from 'react';
+import React, { useState, useCallback } from 'react';
 
 import { validateEmail } from '../../../../lib/emailValidator';
 import { isJSON } from '../../../../lib/utils/isJSON';
 import Page from '../../../components/Page';
-import { sendMailObject } from './MailerRoute';
+import type { sendMailObject } from './MailerRoute';
 
 type MailerProps = {
 	sendMail: ({ fromEmail, subject, emailBody, dryRun, query }: sendMailObject) => void;
diff --git a/apps/meteor/client/views/admin/mailer/MailerRoute.tsx b/apps/meteor/client/views/admin/mailer/MailerRoute.tsx
index caae522de5e..2ea4d32b94d 100644
--- a/apps/meteor/client/views/admin/mailer/MailerRoute.tsx
+++ b/apps/meteor/client/views/admin/mailer/MailerRoute.tsx
@@ -1,5 +1,6 @@
 import { useToastMessageDispatch, usePermission, useTranslation, useEndpoint } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 import { Mailer } from './Mailer';
diff --git a/apps/meteor/client/views/admin/oauthApps/EditOauthApp.tsx b/apps/meteor/client/views/admin/oauthApps/EditOauthApp.tsx
index ed21d957565..efd98aa534b 100644
--- a/apps/meteor/client/views/admin/oauthApps/EditOauthApp.tsx
+++ b/apps/meteor/client/views/admin/oauthApps/EditOauthApp.tsx
@@ -1,8 +1,10 @@
-import { IOAuthApps, Serialized } from '@rocket.chat/core-typings';
+import type { IOAuthApps, Serialized } from '@rocket.chat/core-typings';
 import { Button, ButtonGroup, TextInput, Field, Icon, TextAreaInput, ToggleSwitch, FieldGroup } from '@rocket.chat/fuselage';
 import { useSetModal, useToastMessageDispatch, useRoute, useMethod, useAbsoluteUrl, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useCallback, useMemo, ReactElement, ComponentProps } from 'react';
-import { useForm, SubmitHandler, Controller } from 'react-hook-form';
+import type { ReactElement, ComponentProps } from 'react';
+import React, { useCallback, useMemo } from 'react';
+import type { SubmitHandler } from 'react-hook-form';
+import { useForm, Controller } from 'react-hook-form';
 
 import GenericModal from '../../../components/GenericModal';
 import VerticalBar from '../../../components/VerticalBar';
diff --git a/apps/meteor/client/views/admin/oauthApps/EditOauthAppWithData.tsx b/apps/meteor/client/views/admin/oauthApps/EditOauthAppWithData.tsx
index fe30f37ef34..40709026b8a 100644
--- a/apps/meteor/client/views/admin/oauthApps/EditOauthAppWithData.tsx
+++ b/apps/meteor/client/views/admin/oauthApps/EditOauthAppWithData.tsx
@@ -1,6 +1,7 @@
 import { Box, Button, ButtonGroup, Skeleton, Throbber, InputBox } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useCallback, useMemo } from 'react';
+import type { ReactElement } from 'react';
+import React, { useCallback, useMemo } from 'react';
 
 import { AsyncStatePhase } from '../../../hooks/useAsyncState';
 import { useEndpointData } from '../../../hooks/useEndpointData';
diff --git a/apps/meteor/client/views/admin/oauthApps/OAuthAddApp.tsx b/apps/meteor/client/views/admin/oauthApps/OAuthAddApp.tsx
index cec7ac2d4f0..6df2def0e0d 100644
--- a/apps/meteor/client/views/admin/oauthApps/OAuthAddApp.tsx
+++ b/apps/meteor/client/views/admin/oauthApps/OAuthAddApp.tsx
@@ -1,7 +1,9 @@
 import { Button, ButtonGroup, TextInput, Field, TextAreaInput, ToggleSwitch, FieldGroup } from '@rocket.chat/fuselage';
 import { useToastMessageDispatch, useRoute, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useCallback } from 'react';
-import { useForm, SubmitHandler, Controller } from 'react-hook-form';
+import type { ReactElement } from 'react';
+import React, { useCallback } from 'react';
+import type { SubmitHandler } from 'react-hook-form';
+import { useForm, Controller } from 'react-hook-form';
 
 import VerticalBar from '../../../components/VerticalBar';
 
diff --git a/apps/meteor/client/views/admin/oauthApps/OAuthAppsPage.tsx b/apps/meteor/client/views/admin/oauthApps/OAuthAppsPage.tsx
index 78e5a44bf91..72a83f44c41 100644
--- a/apps/meteor/client/views/admin/oauthApps/OAuthAppsPage.tsx
+++ b/apps/meteor/client/views/admin/oauthApps/OAuthAppsPage.tsx
@@ -1,6 +1,7 @@
 import { Button, Icon } from '@rocket.chat/fuselage';
 import { useRouteParameter, useRoute, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import Page from '../../../components/Page';
 import EditOauthAppWithData from './EditOauthAppWithData';
diff --git a/apps/meteor/client/views/admin/oauthApps/OAuthAppsRoute.tsx b/apps/meteor/client/views/admin/oauthApps/OAuthAppsRoute.tsx
index 7fb188227a0..fba79bf8664 100644
--- a/apps/meteor/client/views/admin/oauthApps/OAuthAppsRoute.tsx
+++ b/apps/meteor/client/views/admin/oauthApps/OAuthAppsRoute.tsx
@@ -1,5 +1,6 @@
 import { usePermission } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 import OAuthAppsPage from './OAuthAppsPage';
diff --git a/apps/meteor/client/views/admin/oauthApps/OAuthAppsTable.tsx b/apps/meteor/client/views/admin/oauthApps/OAuthAppsTable.tsx
index e450483cbd0..ea42b855fc3 100644
--- a/apps/meteor/client/views/admin/oauthApps/OAuthAppsTable.tsx
+++ b/apps/meteor/client/views/admin/oauthApps/OAuthAppsTable.tsx
@@ -1,6 +1,7 @@
 import { Table } from '@rocket.chat/fuselage';
 import { useRoute, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useMemo, useCallback, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo, useCallback } from 'react';
 
 import GenericTable from '../../../components/GenericTable';
 import { useEndpointData } from '../../../hooks/useEndpointData';
diff --git a/apps/meteor/client/views/admin/permissions/EditRolePage.tsx b/apps/meteor/client/views/admin/permissions/EditRolePage.tsx
index 824f702c885..4d5c0dcfcd4 100644
--- a/apps/meteor/client/views/admin/permissions/EditRolePage.tsx
+++ b/apps/meteor/client/views/admin/permissions/EditRolePage.tsx
@@ -1,8 +1,9 @@
-import { IRole } from '@rocket.chat/core-typings';
+import type { IRole } from '@rocket.chat/core-typings';
 import { Box, ButtonGroup, Button, Margins } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useSetModal, useToastMessageDispatch, useRoute, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 
 import GenericModal from '../../../components/GenericModal';
diff --git a/apps/meteor/client/views/admin/permissions/EditRolePageWithData.tsx b/apps/meteor/client/views/admin/permissions/EditRolePageWithData.tsx
index e5895fc782e..306e7620ec5 100644
--- a/apps/meteor/client/views/admin/permissions/EditRolePageWithData.tsx
+++ b/apps/meteor/client/views/admin/permissions/EditRolePageWithData.tsx
@@ -1,7 +1,8 @@
-import { IRole } from '@rocket.chat/core-typings';
+import type { IRole } from '@rocket.chat/core-typings';
 import { Callout } from '@rocket.chat/fuselage';
 import { useRouteParameter, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import EditRolePage from './EditRolePage';
 import { useRole } from './hooks/useRole';
diff --git a/apps/meteor/client/views/admin/permissions/PermissionsContextBar.tsx b/apps/meteor/client/views/admin/permissions/PermissionsContextBar.tsx
index d9882f2c493..a0a79c23797 100644
--- a/apps/meteor/client/views/admin/permissions/PermissionsContextBar.tsx
+++ b/apps/meteor/client/views/admin/permissions/PermissionsContextBar.tsx
@@ -1,6 +1,7 @@
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useRouteParameter, useRoute, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import VerticalBar from '../../../components/VerticalBar';
 import EditRolePageWithData from './EditRolePageWithData';
diff --git a/apps/meteor/client/views/admin/permissions/PermissionsRouter.tsx b/apps/meteor/client/views/admin/permissions/PermissionsRouter.tsx
index 29fc5d0fb62..a746a4bf345 100644
--- a/apps/meteor/client/views/admin/permissions/PermissionsRouter.tsx
+++ b/apps/meteor/client/views/admin/permissions/PermissionsRouter.tsx
@@ -1,5 +1,6 @@
 import { useRouteParameter, usePermission } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 import PermissionsTable from './PermissionsTable';
diff --git a/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionRow.tsx b/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionRow.tsx
index 4b26c549431..36d337a024c 100644
--- a/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionRow.tsx
+++ b/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionRow.tsx
@@ -1,8 +1,10 @@
-import { IRole, IPermission } from '@rocket.chat/core-typings';
+import type { IRole, IPermission } from '@rocket.chat/core-typings';
 import { TableRow, TableCell } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useTranslation, TranslationKey } from '@rocket.chat/ui-contexts';
-import React, { useState, memo, ReactElement } from 'react';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
+import type { ReactElement } from 'react';
+import React, { useState, memo } from 'react';
 
 import { CONSTANTS } from '../../../../../app/authorization/lib';
 import { useChangeRole } from '../hooks/useChangeRole';
diff --git a/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionsTable.tsx b/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionsTable.tsx
index c99cc197248..63e04b8ace9 100644
--- a/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionsTable.tsx
+++ b/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionsTable.tsx
@@ -1,7 +1,8 @@
 import { Margins, Icon, Tabs, Button, Pagination, Tile } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useRoute, usePermission, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useState, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useState } from 'react';
 
 import { GenericTable, GenericTableHeader, GenericTableHeaderCell, GenericTableBody } from '../../../../components/GenericTable';
 import { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
diff --git a/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionsTableFilter.tsx b/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionsTableFilter.tsx
index 1f6c0f98f1a..2926ef82124 100644
--- a/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionsTableFilter.tsx
+++ b/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionsTableFilter.tsx
@@ -1,7 +1,8 @@
 import { TextInput } from '@rocket.chat/fuselage';
 import { useMutableCallback, useDebouncedValue } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useState, useEffect, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useState, useEffect } from 'react';
 
 const PermissionsTableFilter = ({ onChange }: { onChange: (debouncedFilter: string) => void }): ReactElement => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/admin/permissions/PermissionsTable/RoleCell.tsx b/apps/meteor/client/views/admin/permissions/PermissionsTable/RoleCell.tsx
index 275879c560d..f2ca908d951 100644
--- a/apps/meteor/client/views/admin/permissions/PermissionsTable/RoleCell.tsx
+++ b/apps/meteor/client/views/admin/permissions/PermissionsTable/RoleCell.tsx
@@ -1,7 +1,8 @@
-import { IRole } from '@rocket.chat/core-typings';
+import type { IRole } from '@rocket.chat/core-typings';
 import { TableCell, Margins, Box, CheckBox, Throbber } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import React, { useState, memo, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useState, memo } from 'react';
 
 import { AuthorizationUtils } from '../../../../../app/authorization/lib';
 
diff --git a/apps/meteor/client/views/admin/permissions/PermissionsTable/RoleHeader.tsx b/apps/meteor/client/views/admin/permissions/PermissionsTable/RoleHeader.tsx
index 2639e7c96e2..237fd007cf5 100644
--- a/apps/meteor/client/views/admin/permissions/PermissionsTable/RoleHeader.tsx
+++ b/apps/meteor/client/views/admin/permissions/PermissionsTable/RoleHeader.tsx
@@ -1,9 +1,10 @@
-import { IRole } from '@rocket.chat/core-typings';
+import type { IRole } from '@rocket.chat/core-typings';
 import { css } from '@rocket.chat/css-in-js';
 import { Margins, Box, Icon } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useRoute } from '@rocket.chat/ui-contexts';
-import React, { memo, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { memo } from 'react';
 
 import GenericTable from '../../../../components/GenericTable';
 
diff --git a/apps/meteor/client/views/admin/permissions/RoleForm.tsx b/apps/meteor/client/views/admin/permissions/RoleForm.tsx
index 560ade11373..4563f458569 100644
--- a/apps/meteor/client/views/admin/permissions/RoleForm.tsx
+++ b/apps/meteor/client/views/admin/permissions/RoleForm.tsx
@@ -1,6 +1,8 @@
-import { Box, Field, TextInput, Select, ToggleSwitch, SelectOption } from '@rocket.chat/fuselage';
+import type { SelectOption } from '@rocket.chat/fuselage';
+import { Box, Field, TextInput, Select, ToggleSwitch } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useMemo, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo } from 'react';
 import { useFormContext, Controller } from 'react-hook-form';
 
 type RoleFormProps = {
diff --git a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePage.tsx b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePage.tsx
index ced01fb2051..1df48100157 100644
--- a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePage.tsx
+++ b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePage.tsx
@@ -1,8 +1,9 @@
-import { IRole, IRoom, IUser } from '@rocket.chat/core-typings';
+import type { IRole, IRoom, IUser } from '@rocket.chat/core-typings';
 import { Box, Field, Margins, ButtonGroup, Button, Callout } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useToastMessageDispatch, useRoute, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useRef, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useRef } from 'react';
 import { useForm, Controller } from 'react-hook-form';
 
 import Page from '../../../../components/Page';
diff --git a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePageWithData.tsx b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePageWithData.tsx
index cb1ff6f52f6..8639c2407a6 100644
--- a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePageWithData.tsx
+++ b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePageWithData.tsx
@@ -1,5 +1,6 @@
 import { useRouteParameter } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { useRole } from '../hooks/useRole';
 import UsersInRolePage from './UsersInRolePage';
diff --git a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/UsersInRoleTable.tsx b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/UsersInRoleTable.tsx
index 50dc79811fe..33327fddaad 100644
--- a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/UsersInRoleTable.tsx
+++ b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/UsersInRoleTable.tsx
@@ -1,15 +1,16 @@
-import { IRole, IRoom, IUserInRole } from '@rocket.chat/core-typings';
+import type { IRole, IRoom, IUserInRole } from '@rocket.chat/core-typings';
 import { States, StatesIcon, StatesTitle, Pagination } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useSetModal, useToastMessageDispatch, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import GenericModal from '../../../../../components/GenericModal';
 import { GenericTable, GenericTableHeader, GenericTableHeaderCell, GenericTableBody } from '../../../../../components/GenericTable';
-import { usePagination } from '../../../../../components/GenericTable/hooks/usePagination';
+import type { usePagination } from '../../../../../components/GenericTable/hooks/usePagination';
 import UsersInRoleTableRow from './UsersInRoleTableRow';
 
-type UsersInRoleTable = {
+type UsersInRoleTableProps = {
 	users: IUserInRole[];
 	reload: () => void;
 	roleName: IRole['name'];
@@ -20,7 +21,16 @@ type UsersInRoleTable = {
 	paginationData: ReturnType<typeof usePagination>;
 };
 
-const UsersInRoleTable = ({ users, reload, roleName, roleId, description, total, rid, paginationData }: UsersInRoleTable): ReactElement => {
+const UsersInRoleTable = ({
+	users,
+	reload,
+	roleName,
+	roleId,
+	description,
+	total,
+	rid,
+	paginationData,
+}: UsersInRoleTableProps): ReactElement => {
 	const t = useTranslation();
 	const setModal = useSetModal();
 	const dispatchToastMessage = useToastMessageDispatch();
diff --git a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/UsersInRoleTableRow.tsx b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/UsersInRoleTableRow.tsx
index 9234506fdb1..d12818a3144 100644
--- a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/UsersInRoleTableRow.tsx
+++ b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/UsersInRoleTableRow.tsx
@@ -1,7 +1,8 @@
-import { IUserInRole } from '@rocket.chat/core-typings';
+import type { IUserInRole } from '@rocket.chat/core-typings';
 import { Box, TableRow, TableCell, Button, Icon } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import React, { memo, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { memo } from 'react';
 
 import { getUserEmailAddress } from '../../../../../../lib/getUserEmailAddress';
 import UserAvatar from '../../../../../components/avatar/UserAvatar';
diff --git a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/UsersInRoleTableWithData.tsx b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/UsersInRoleTableWithData.tsx
index b6c94d1f653..7c03f6e970e 100644
--- a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/UsersInRoleTableWithData.tsx
+++ b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/UsersInRoleTableWithData.tsx
@@ -1,5 +1,6 @@
-import { IRole, IRoom, IUserInRole } from '@rocket.chat/core-typings';
-import React, { useEffect, useMemo, ReactElement, MutableRefObject } from 'react';
+import type { IRole, IRoom, IUserInRole } from '@rocket.chat/core-typings';
+import type { ReactElement, MutableRefObject } from 'react';
+import React, { useEffect, useMemo } from 'react';
 
 import { usePagination } from '../../../../../components/GenericTable/hooks/usePagination';
 import { useEndpointData } from '../../../../../hooks/useEndpointData';
diff --git a/apps/meteor/client/views/admin/rooms/EditRoom.tsx b/apps/meteor/client/views/admin/rooms/EditRoom.tsx
index 8d09b7a4a14..b081385c3aa 100644
--- a/apps/meteor/client/views/admin/rooms/EditRoom.tsx
+++ b/apps/meteor/client/views/admin/rooms/EditRoom.tsx
@@ -1,8 +1,9 @@
-import { IRoom, RoomAdminFieldsType } from '@rocket.chat/core-typings';
+import type { IRoom, RoomAdminFieldsType } from '@rocket.chat/core-typings';
 import { Box, Button, ButtonGroup, TextInput, Field, ToggleSwitch, Icon, TextAreaInput } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useSetModal, useToastMessageDispatch, useRoute, usePermission, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useState, useMemo, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useState, useMemo } from 'react';
 
 import { RoomSettingsEnum } from '../../../../definition/IRoomTypeConfig';
 import GenericModal from '../../../components/GenericModal';
diff --git a/apps/meteor/client/views/admin/rooms/EditRoomContextBar.tsx b/apps/meteor/client/views/admin/rooms/EditRoomContextBar.tsx
index 87f1368909c..e99841c730e 100644
--- a/apps/meteor/client/views/admin/rooms/EditRoomContextBar.tsx
+++ b/apps/meteor/client/views/admin/rooms/EditRoomContextBar.tsx
@@ -1,5 +1,6 @@
 import { usePermission } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 import EditRoomWithData from './EditRoomWithData';
diff --git a/apps/meteor/client/views/admin/rooms/EditRoomWithData.tsx b/apps/meteor/client/views/admin/rooms/EditRoomWithData.tsx
index 201b6e063b9..c942bad4ffe 100644
--- a/apps/meteor/client/views/admin/rooms/EditRoomWithData.tsx
+++ b/apps/meteor/client/views/admin/rooms/EditRoomWithData.tsx
@@ -1,5 +1,6 @@
 import { Box, Skeleton } from '@rocket.chat/fuselage';
-import React, { useMemo, FC } from 'react';
+import type { FC } from 'react';
+import React, { useMemo } from 'react';
 
 import { AsyncStatePhase } from '../../../hooks/useAsyncState';
 import { useEndpointData } from '../../../hooks/useEndpointData';
diff --git a/apps/meteor/client/views/admin/rooms/FilterByTypeAndText.tsx b/apps/meteor/client/views/admin/rooms/FilterByTypeAndText.tsx
index a37657c36e3..70fbb5ed24d 100644
--- a/apps/meteor/client/views/admin/rooms/FilterByTypeAndText.tsx
+++ b/apps/meteor/client/views/admin/rooms/FilterByTypeAndText.tsx
@@ -1,7 +1,8 @@
 import { Box, Icon, TextInput, Field, CheckBox, Margins } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useCallback, useState, useEffect, ReactElement, Dispatch, SetStateAction } from 'react';
+import type { ReactElement, Dispatch, SetStateAction } from 'react';
+import React, { useCallback, useState, useEffect } from 'react';
 
 export const DEFAULT_TYPES = ['d', 'p', 'c', 'teams'];
 
diff --git a/apps/meteor/client/views/admin/rooms/RoomsPage.tsx b/apps/meteor/client/views/admin/rooms/RoomsPage.tsx
index fff81cc1138..6694d64f089 100644
--- a/apps/meteor/client/views/admin/rooms/RoomsPage.tsx
+++ b/apps/meteor/client/views/admin/rooms/RoomsPage.tsx
@@ -1,5 +1,6 @@
 import { useRouteParameter, useRoute, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useRef, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useRef } from 'react';
 
 import Page from '../../../components/Page';
 import VerticalBar from '../../../components/VerticalBar';
diff --git a/apps/meteor/client/views/admin/rooms/RoomsRoute.tsx b/apps/meteor/client/views/admin/rooms/RoomsRoute.tsx
index 880df403442..bda14931282 100644
--- a/apps/meteor/client/views/admin/rooms/RoomsRoute.tsx
+++ b/apps/meteor/client/views/admin/rooms/RoomsRoute.tsx
@@ -1,5 +1,6 @@
 import { usePermission } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 import RoomsPage from './RoomsPage';
diff --git a/apps/meteor/client/views/admin/rooms/RoomsTable.tsx b/apps/meteor/client/views/admin/rooms/RoomsTable.tsx
index def69f4f4a1..1bcae5250dc 100644
--- a/apps/meteor/client/views/admin/rooms/RoomsTable.tsx
+++ b/apps/meteor/client/views/admin/rooms/RoomsTable.tsx
@@ -1,8 +1,9 @@
-import { IRoom } from '@rocket.chat/core-typings';
+import type { IRoom } from '@rocket.chat/core-typings';
 import { Box, Table, Icon } from '@rocket.chat/fuselage';
 import { useMediaQuery, useDebouncedValue } from '@rocket.chat/fuselage-hooks';
 import { useRoute, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useState, useEffect, useMemo, useCallback, CSSProperties, ReactElement, MutableRefObject } from 'react';
+import type { CSSProperties, ReactElement, MutableRefObject } from 'react';
+import React, { useState, useEffect, useMemo, useCallback } from 'react';
 
 import GenericTable from '../../../components/GenericTable';
 import RoomAvatar from '../../../components/avatar/RoomAvatar';
diff --git a/apps/meteor/client/views/admin/settings/EditableSettingsProvider.tsx b/apps/meteor/client/views/admin/settings/EditableSettingsProvider.tsx
index 81cbf33d555..aa9b261b7f3 100644
--- a/apps/meteor/client/views/admin/settings/EditableSettingsProvider.tsx
+++ b/apps/meteor/client/views/admin/settings/EditableSettingsProvider.tsx
@@ -1,14 +1,17 @@
-import { SettingId, GroupId, ISetting, TabId } from '@rocket.chat/core-typings';
+import type { SettingId, GroupId, ISetting, TabId } from '@rocket.chat/core-typings';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useSettings, SettingsContextQuery } from '@rocket.chat/ui-contexts';
+import type { SettingsContextQuery } from '@rocket.chat/ui-contexts';
+import { useSettings } from '@rocket.chat/ui-contexts';
 import { Mongo } from 'meteor/mongo';
 import { Tracker } from 'meteor/tracker';
 import type { FilterOperators } from 'mongodb';
-import React, { useEffect, useMemo, FunctionComponent, useRef, MutableRefObject } from 'react';
+import type { FunctionComponent, MutableRefObject } from 'react';
+import React, { useEffect, useMemo, useRef } from 'react';
 
 import { useIsEnterprise } from '../../../hooks/useIsEnterprise';
 import { createReactiveSubscriptionFactory } from '../../../lib/createReactiveSubscriptionFactory';
-import { EditableSettingsContext, EditableSetting, EditableSettingsContextValue } from '../EditableSettingsContext';
+import type { EditableSetting, EditableSettingsContextValue } from '../EditableSettingsContext';
+import { EditableSettingsContext } from '../EditableSettingsContext';
 
 const defaultQuery: SettingsContextQuery = {};
 
diff --git a/apps/meteor/client/views/admin/settings/GroupPage.stories.tsx b/apps/meteor/client/views/admin/settings/GroupPage.stories.tsx
index c1b232dbf0c..83112bc4255 100644
--- a/apps/meteor/client/views/admin/settings/GroupPage.stories.tsx
+++ b/apps/meteor/client/views/admin/settings/GroupPage.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import GroupPage from './GroupPage';
diff --git a/apps/meteor/client/views/admin/settings/GroupPage.tsx b/apps/meteor/client/views/admin/settings/GroupPage.tsx
index 7b05285343e..843be95c852 100644
--- a/apps/meteor/client/views/admin/settings/GroupPage.tsx
+++ b/apps/meteor/client/views/admin/settings/GroupPage.tsx
@@ -1,6 +1,7 @@
 import type { ISetting, ISettingColor } from '@rocket.chat/core-typings';
 import { Accordion, Box, Button, ButtonGroup } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import {
 	useToastMessageDispatch,
 	useUser,
@@ -8,13 +9,14 @@ import {
 	useSettings,
 	useTranslation,
 	useLoadLanguage,
-	TranslationKey,
 	useRoute,
 } from '@rocket.chat/ui-contexts';
-import React, { useMemo, memo, FC, ReactNode, FormEvent, MouseEvent } from 'react';
+import type { FC, ReactNode, FormEvent, MouseEvent } from 'react';
+import React, { useMemo, memo } from 'react';
 
 import Page from '../../../components/Page';
-import { useEditableSettingsDispatch, useEditableSettings, EditableSetting } from '../EditableSettingsContext';
+import type { EditableSetting } from '../EditableSettingsContext';
+import { useEditableSettingsDispatch, useEditableSettings } from '../EditableSettingsContext';
 import GroupPageSkeleton from './GroupPageSkeleton';
 
 type GroupPageProps = {
diff --git a/apps/meteor/client/views/admin/settings/GroupPageSkeleton.tsx b/apps/meteor/client/views/admin/settings/GroupPageSkeleton.tsx
index 9d275e06e0d..373358d2f54 100644
--- a/apps/meteor/client/views/admin/settings/GroupPageSkeleton.tsx
+++ b/apps/meteor/client/views/admin/settings/GroupPageSkeleton.tsx
@@ -1,6 +1,7 @@
 import { Accordion, Box, Button, ButtonGroup, Skeleton } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useMemo } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo } from 'react';
 
 import Page from '../../../components/Page';
 import Section from './Section';
diff --git a/apps/meteor/client/views/admin/settings/GroupSelector.stories.tsx b/apps/meteor/client/views/admin/settings/GroupSelector.stories.tsx
index 369d8236a49..4b505dd1929 100644
--- a/apps/meteor/client/views/admin/settings/GroupSelector.stories.tsx
+++ b/apps/meteor/client/views/admin/settings/GroupSelector.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import GroupSelector from './GroupSelector';
diff --git a/apps/meteor/client/views/admin/settings/GroupSelector.tsx b/apps/meteor/client/views/admin/settings/GroupSelector.tsx
index 9a946846654..1de5030f213 100644
--- a/apps/meteor/client/views/admin/settings/GroupSelector.tsx
+++ b/apps/meteor/client/views/admin/settings/GroupSelector.tsx
@@ -1,6 +1,7 @@
-import { GroupId } from '@rocket.chat/core-typings';
+import type { GroupId } from '@rocket.chat/core-typings';
 import { useSettingStructure } from '@rocket.chat/ui-contexts';
-import React, { FunctionComponent } from 'react';
+import type { FunctionComponent } from 'react';
+import React from 'react';
 
 import GroupPage from './GroupPage';
 import AssetsGroupPage from './groups/AssetsGroupPage';
diff --git a/apps/meteor/client/views/admin/settings/MemoizedSetting.tsx b/apps/meteor/client/views/admin/settings/MemoizedSetting.tsx
index 4fe8a9c0b76..535051e3aa8 100644
--- a/apps/meteor/client/views/admin/settings/MemoizedSetting.tsx
+++ b/apps/meteor/client/views/admin/settings/MemoizedSetting.tsx
@@ -1,6 +1,7 @@
-import { ISettingBase, SettingEditor, SettingValue } from '@rocket.chat/core-typings';
+import type { ISettingBase, SettingEditor, SettingValue } from '@rocket.chat/core-typings';
 import { Callout, Field, Margins } from '@rocket.chat/fuselage';
-import React, { ElementType, memo, ReactElement, ReactNode } from 'react';
+import type { ElementType, ReactElement, ReactNode } from 'react';
+import React, { memo } from 'react';
 
 import ActionSettingInput from './inputs/ActionSettingInput';
 import AssetSettingInput from './inputs/AssetSettingInput';
diff --git a/apps/meteor/client/views/admin/settings/ResetSettingButton.stories.tsx b/apps/meteor/client/views/admin/settings/ResetSettingButton.stories.tsx
index 36825cbd586..8b98be00185 100644
--- a/apps/meteor/client/views/admin/settings/ResetSettingButton.stories.tsx
+++ b/apps/meteor/client/views/admin/settings/ResetSettingButton.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import ResetSettingButton from './ResetSettingButton';
diff --git a/apps/meteor/client/views/admin/settings/ResetSettingButton.tsx b/apps/meteor/client/views/admin/settings/ResetSettingButton.tsx
index 30cff7459e7..90616464c0e 100644
--- a/apps/meteor/client/views/admin/settings/ResetSettingButton.tsx
+++ b/apps/meteor/client/views/admin/settings/ResetSettingButton.tsx
@@ -1,6 +1,8 @@
-import { Button, IconButton } from '@rocket.chat/fuselage';
+import type { Button } from '@rocket.chat/fuselage';
+import { IconButton } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ComponentProps, ReactElement } from 'react';
+import type { ComponentProps, ReactElement } from 'react';
+import React from 'react';
 
 function ResetSettingButton(props: ComponentProps<typeof Button>): ReactElement {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/admin/settings/Section.stories.tsx b/apps/meteor/client/views/admin/settings/Section.stories.tsx
index d5c5e36118e..05ec280ea74 100644
--- a/apps/meteor/client/views/admin/settings/Section.stories.tsx
+++ b/apps/meteor/client/views/admin/settings/Section.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import Section from './Section';
diff --git a/apps/meteor/client/views/admin/settings/Section.tsx b/apps/meteor/client/views/admin/settings/Section.tsx
index 8dc93cb46ee..fe65824cd9a 100644
--- a/apps/meteor/client/views/admin/settings/Section.tsx
+++ b/apps/meteor/client/views/admin/settings/Section.tsx
@@ -1,8 +1,10 @@
 import { isSettingColor } from '@rocket.chat/core-typings';
 import { Accordion, Box, Button, FieldGroup } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { TranslationKey, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, ReactNode, useMemo } from 'react';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
+import type { ReactElement, ReactNode } from 'react';
+import React, { useMemo } from 'react';
 
 import { useEditableSettings, useEditableSettingsDispatch } from '../EditableSettingsContext';
 import SectionSkeleton from './SectionSkeleton';
diff --git a/apps/meteor/client/views/admin/settings/SectionSkeleton.tsx b/apps/meteor/client/views/admin/settings/SectionSkeleton.tsx
index 3d76a5ac49f..ff509e08fc4 100644
--- a/apps/meteor/client/views/admin/settings/SectionSkeleton.tsx
+++ b/apps/meteor/client/views/admin/settings/SectionSkeleton.tsx
@@ -1,5 +1,6 @@
 import { Accordion, Box, FieldGroup, Skeleton } from '@rocket.chat/fuselage';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import Setting from './Setting';
 
diff --git a/apps/meteor/client/views/admin/settings/Setting.stories.tsx b/apps/meteor/client/views/admin/settings/Setting.stories.tsx
index efd1f088511..e80db37d821 100644
--- a/apps/meteor/client/views/admin/settings/Setting.stories.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting.stories.tsx
@@ -1,5 +1,5 @@
 import { FieldGroup } from '@rocket.chat/fuselage';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import Setting from './Setting';
diff --git a/apps/meteor/client/views/admin/settings/Setting.tsx b/apps/meteor/client/views/admin/settings/Setting.tsx
index b70212c22c9..f2e6878a038 100644
--- a/apps/meteor/client/views/admin/settings/Setting.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting.tsx
@@ -1,7 +1,9 @@
-import { ISettingColor, isSettingColor, SettingEditor, SettingValue } from '@rocket.chat/core-typings';
+import type { ISettingColor, SettingEditor, SettingValue } from '@rocket.chat/core-typings';
+import { isSettingColor } from '@rocket.chat/core-typings';
 import { useDebouncedCallback } from '@rocket.chat/fuselage-hooks';
 import { useSettingStructure, useTranslation, useAbsoluteUrl } from '@rocket.chat/ui-contexts';
-import React, { useEffect, useMemo, useState, useCallback, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useEffect, useMemo, useState, useCallback } from 'react';
 
 import MarkdownText from '../../../components/MarkdownText';
 import { useEditableSetting, useEditableSettingsDispatch, useIsEnterprise } from '../EditableSettingsContext';
diff --git a/apps/meteor/client/views/admin/settings/SettingSkeleton.tsx b/apps/meteor/client/views/admin/settings/SettingSkeleton.tsx
index ce26dfcce52..62e34c069ed 100644
--- a/apps/meteor/client/views/admin/settings/SettingSkeleton.tsx
+++ b/apps/meteor/client/views/admin/settings/SettingSkeleton.tsx
@@ -1,5 +1,6 @@
 import { Field, Flex, InputBox, Skeleton } from '@rocket.chat/fuselage';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 const SettingSkeleton = (): ReactElement => (
 	<Field>
diff --git a/apps/meteor/client/views/admin/settings/SettingsGroupCard.tsx b/apps/meteor/client/views/admin/settings/SettingsGroupCard.tsx
index db3915c9eb7..d8a5bde3bd8 100644
--- a/apps/meteor/client/views/admin/settings/SettingsGroupCard.tsx
+++ b/apps/meteor/client/views/admin/settings/SettingsGroupCard.tsx
@@ -1,10 +1,12 @@
-import { ISetting } from '@rocket.chat/core-typings';
+import type { ISetting } from '@rocket.chat/core-typings';
 import { css } from '@rocket.chat/css-in-js';
 import { Button, Box } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { Card } from '@rocket.chat/ui-client';
-import { useRoute, TranslationKey, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useRoute, useTranslation } from '@rocket.chat/ui-contexts';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import MarkdownText from '../../../components/MarkdownText';
 
@@ -15,13 +17,13 @@ const clampStyle = css`
 	-webkit-box-orient: vertical;
 `;
 
-type SettingsGroupCard = {
+type SettingsGroupCardProps = {
 	id: ISetting['_id'];
 	title: TranslationKey;
 	description?: TranslationKey;
 };
 
-const SettingsGroupCard = ({ id, title, description }: SettingsGroupCard): ReactElement => {
+const SettingsGroupCard = ({ id, title, description }: SettingsGroupCardProps): ReactElement => {
 	const t = useTranslation();
 	const router = useRoute('admin-settings');
 
diff --git a/apps/meteor/client/views/admin/settings/SettingsPage.tsx b/apps/meteor/client/views/admin/settings/SettingsPage.tsx
index cd753788f11..8969710a66b 100644
--- a/apps/meteor/client/views/admin/settings/SettingsPage.tsx
+++ b/apps/meteor/client/views/admin/settings/SettingsPage.tsx
@@ -1,7 +1,9 @@
 import { Icon, SearchInput, Skeleton, Grid, States, StatesIcon, StatesTitle } from '@rocket.chat/fuselage';
 import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
-import { useIsSettingsContextLoading, TranslationKey, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useCallback, useState, ReactElement } from 'react';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useIsSettingsContextLoading, useTranslation } from '@rocket.chat/ui-contexts';
+import type { ReactElement } from 'react';
+import React, { useCallback, useState } from 'react';
 
 import Page from '../../../components/Page';
 import PageBlockWithBorder from '../../../components/Page/PageBlockWithBorder';
diff --git a/apps/meteor/client/views/admin/settings/SettingsRoute.tsx b/apps/meteor/client/views/admin/settings/SettingsRoute.tsx
index 18b13c30a2a..d0c0c000377 100644
--- a/apps/meteor/client/views/admin/settings/SettingsRoute.tsx
+++ b/apps/meteor/client/views/admin/settings/SettingsRoute.tsx
@@ -1,5 +1,6 @@
 import { useRouteParameter, useIsPrivilegedSettingsContext } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 import EditableSettingsProvider from './EditableSettingsProvider';
diff --git a/apps/meteor/client/views/admin/settings/groups/AssetsGroupPage.tsx b/apps/meteor/client/views/admin/settings/groups/AssetsGroupPage.tsx
index c408f34531f..6d4bb90e3d1 100644
--- a/apps/meteor/client/views/admin/settings/groups/AssetsGroupPage.tsx
+++ b/apps/meteor/client/views/admin/settings/groups/AssetsGroupPage.tsx
@@ -1,5 +1,6 @@
-import { ISetting } from '@rocket.chat/core-typings';
-import React, { memo, ReactElement } from 'react';
+import type { ISetting } from '@rocket.chat/core-typings';
+import type { ReactElement } from 'react';
+import React, { memo } from 'react';
 
 import { useEditableSettingsGroupSections } from '../../EditableSettingsContext';
 import GroupPage from '../GroupPage';
diff --git a/apps/meteor/client/views/admin/settings/groups/CreateOAuthModal.tsx b/apps/meteor/client/views/admin/settings/groups/CreateOAuthModal.tsx
index 58de3c638c5..c331333d2ba 100644
--- a/apps/meteor/client/views/admin/settings/groups/CreateOAuthModal.tsx
+++ b/apps/meteor/client/views/admin/settings/groups/CreateOAuthModal.tsx
@@ -1,6 +1,7 @@
 import { TextInput, Field } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useState, FormEvent } from 'react';
+import type { ReactElement, FormEvent } from 'react';
+import React, { useState } from 'react';
 
 import GenericModal from '../../../../components/GenericModal';
 
diff --git a/apps/meteor/client/views/admin/settings/groups/GenericGroupPage.tsx b/apps/meteor/client/views/admin/settings/groups/GenericGroupPage.tsx
index 9b093037773..6143d03ae26 100644
--- a/apps/meteor/client/views/admin/settings/groups/GenericGroupPage.tsx
+++ b/apps/meteor/client/views/admin/settings/groups/GenericGroupPage.tsx
@@ -1,5 +1,6 @@
-import { ISetting } from '@rocket.chat/core-typings';
-import React, { memo, ReactElement } from 'react';
+import type { ISetting } from '@rocket.chat/core-typings';
+import type { ReactElement } from 'react';
+import React, { memo } from 'react';
 
 import { useEditableSettingsGroupSections } from '../../EditableSettingsContext';
 import GroupPage from '../GroupPage';
diff --git a/apps/meteor/client/views/admin/settings/groups/LDAPGroupPage.tsx b/apps/meteor/client/views/admin/settings/groups/LDAPGroupPage.tsx
index 7cc0c3e895c..7eb6fa11ac4 100644
--- a/apps/meteor/client/views/admin/settings/groups/LDAPGroupPage.tsx
+++ b/apps/meteor/client/views/admin/settings/groups/LDAPGroupPage.tsx
@@ -2,7 +2,8 @@ import type { ISetting } from '@rocket.chat/core-typings';
 import { Button, Box, TextInput, Field } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useSetModal, useToastMessageDispatch, useSetting, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FormEvent, memo, useMemo } from 'react';
+import type { FormEvent } from 'react';
+import React, { memo, useMemo } from 'react';
 
 import GenericModal from '../../../../components/GenericModal';
 import { useEditableSettings } from '../../EditableSettingsContext';
diff --git a/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage.tsx b/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage.tsx
index ec66665bf75..e3aed689b2c 100644
--- a/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage.tsx
+++ b/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage.tsx
@@ -1,7 +1,8 @@
-import { ISetting } from '@rocket.chat/core-typings';
+import type { ISetting } from '@rocket.chat/core-typings';
 import { Button } from '@rocket.chat/fuselage';
 import { useToastMessageDispatch, useAbsoluteUrl, useMethod, useTranslation, useSetModal } from '@rocket.chat/ui-contexts';
-import React, { memo, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { memo } from 'react';
 import s from 'underscore.string';
 
 import GenericModal from '../../../../components/GenericModal';
diff --git a/apps/meteor/client/views/admin/settings/groups/TabbedGroupPage.tsx b/apps/meteor/client/views/admin/settings/groups/TabbedGroupPage.tsx
index 3517824fef7..9015cf2bcd3 100644
--- a/apps/meteor/client/views/admin/settings/groups/TabbedGroupPage.tsx
+++ b/apps/meteor/client/views/admin/settings/groups/TabbedGroupPage.tsx
@@ -1,7 +1,9 @@
-import { ISetting } from '@rocket.chat/core-typings';
+import type { ISetting } from '@rocket.chat/core-typings';
 import { Tabs } from '@rocket.chat/fuselage';
-import { useTranslation, TranslationKey } from '@rocket.chat/ui-contexts';
-import React, { memo, useState, useMemo, ReactElement } from 'react';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
+import type { ReactElement } from 'react';
+import React, { memo, useState, useMemo } from 'react';
 
 import { useEditableSettingsGroupSections, useEditableSettingsGroupTabs } from '../../EditableSettingsContext';
 import GroupPage from '../GroupPage';
diff --git a/apps/meteor/client/views/admin/settings/groups/VoipGroupPage.tsx b/apps/meteor/client/views/admin/settings/groups/VoipGroupPage.tsx
index 6a06a1207f5..18a3e31b27c 100644
--- a/apps/meteor/client/views/admin/settings/groups/VoipGroupPage.tsx
+++ b/apps/meteor/client/views/admin/settings/groups/VoipGroupPage.tsx
@@ -1,6 +1,7 @@
 import type { ISetting } from '@rocket.chat/core-typings';
 import { Tabs, Box, Accordion } from '@rocket.chat/fuselage';
-import { useSetting, useTranslation, TranslationKey } from '@rocket.chat/ui-contexts';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useSetting, useTranslation } from '@rocket.chat/ui-contexts';
 import React, { memo, useMemo, useState } from 'react';
 
 import NoResults from '../../../../components/GenericTable/NoResults';
diff --git a/apps/meteor/client/views/admin/settings/groups/voip/AssignAgentButton.tsx b/apps/meteor/client/views/admin/settings/groups/voip/AssignAgentButton.tsx
index 6a5c19090d7..681c4aab54b 100644
--- a/apps/meteor/client/views/admin/settings/groups/voip/AssignAgentButton.tsx
+++ b/apps/meteor/client/views/admin/settings/groups/voip/AssignAgentButton.tsx
@@ -1,7 +1,8 @@
 import { Table, IconButton } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useSetModal, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import AssignAgentModal from './AssignAgentModal';
 
diff --git a/apps/meteor/client/views/admin/settings/groups/voip/AssignAgentModal.tsx b/apps/meteor/client/views/admin/settings/groups/voip/AssignAgentModal.tsx
index b210e8a2b09..378532a6e2d 100644
--- a/apps/meteor/client/views/admin/settings/groups/voip/AssignAgentModal.tsx
+++ b/apps/meteor/client/views/admin/settings/groups/voip/AssignAgentModal.tsx
@@ -1,7 +1,8 @@
 import { Button, Modal, Select, Field, FieldGroup } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useToastMessageDispatch, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, useState, useMemo } from 'react';
+import type { FC } from 'react';
+import React, { useState, useMemo } from 'react';
 
 import AutoCompleteAgentWithoutExtension from '../../../../../components/AutoCompleteAgentWithoutExtension';
 import { AsyncStatePhase } from '../../../../../hooks/useAsyncState';
diff --git a/apps/meteor/client/views/admin/settings/groups/voip/RemoveAgentButton.tsx b/apps/meteor/client/views/admin/settings/groups/voip/RemoveAgentButton.tsx
index b2ff3b9da56..f0fb0bc6026 100644
--- a/apps/meteor/client/views/admin/settings/groups/voip/RemoveAgentButton.tsx
+++ b/apps/meteor/client/views/admin/settings/groups/voip/RemoveAgentButton.tsx
@@ -1,7 +1,8 @@
 import { Table, IconButton } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useSetModal, useToastMessageDispatch, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import GenericModal from '../../../../../components/GenericModal';
 
diff --git a/apps/meteor/client/views/admin/settings/groups/voip/VoipExtensionsPage.tsx b/apps/meteor/client/views/admin/settings/groups/voip/VoipExtensionsPage.tsx
index e122220104a..53e0e41e2b2 100644
--- a/apps/meteor/client/views/admin/settings/groups/voip/VoipExtensionsPage.tsx
+++ b/apps/meteor/client/views/admin/settings/groups/voip/VoipExtensionsPage.tsx
@@ -1,7 +1,8 @@
 import { Box, Chip, Table, Button } from '@rocket.chat/fuselage';
 import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
 import { useSetModal, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, useMemo, useCallback, useState } from 'react';
+import type { FC } from 'react';
+import React, { useMemo, useCallback, useState } from 'react';
 
 import GenericTable from '../../../../../components/GenericTable';
 import Page from '../../../../../components/Page';
diff --git a/apps/meteor/client/views/admin/settings/hooks/useSettingsGroups.ts b/apps/meteor/client/views/admin/settings/hooks/useSettingsGroups.ts
index f2b64f3192e..211d22058a4 100644
--- a/apps/meteor/client/views/admin/settings/hooks/useSettingsGroups.ts
+++ b/apps/meteor/client/views/admin/settings/hooks/useSettingsGroups.ts
@@ -1,5 +1,6 @@
 import type { ISetting } from '@rocket.chat/core-typings';
-import { useSettings, TranslationKey, useTranslation } from '@rocket.chat/ui-contexts';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useSettings, useTranslation } from '@rocket.chat/ui-contexts';
 import { useMemo } from 'react';
 
 export const useSettingsGroups = (filter: string): ISetting[] => {
diff --git a/apps/meteor/client/views/admin/settings/inputs/ActionSettingInput.stories.tsx b/apps/meteor/client/views/admin/settings/inputs/ActionSettingInput.stories.tsx
index 938a863ed34..da0e68443dc 100644
--- a/apps/meteor/client/views/admin/settings/inputs/ActionSettingInput.stories.tsx
+++ b/apps/meteor/client/views/admin/settings/inputs/ActionSettingInput.stories.tsx
@@ -1,6 +1,6 @@
 import { Field } from '@rocket.chat/fuselage';
-import { ServerMethods } from '@rocket.chat/ui-contexts';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ServerMethods } from '@rocket.chat/ui-contexts';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import type keys from '../../../../../packages/rocketchat-i18n/i18n/en.i18n.json';
diff --git a/apps/meteor/client/views/admin/settings/inputs/ActionSettingInput.tsx b/apps/meteor/client/views/admin/settings/inputs/ActionSettingInput.tsx
index e0ba71201a7..bd9de953eb3 100644
--- a/apps/meteor/client/views/admin/settings/inputs/ActionSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/inputs/ActionSettingInput.tsx
@@ -1,6 +1,8 @@
 import { Button, Field } from '@rocket.chat/fuselage';
-import { useMethod, ServerMethods, useToastMessageDispatch, useTranslation, TranslationKey } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ServerMethods, TranslationKey } from '@rocket.chat/ui-contexts';
+import { useMethod, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 type ActionSettingInputProps = {
 	_id: string;
diff --git a/apps/meteor/client/views/admin/settings/inputs/AssetSettingInput.stories.tsx b/apps/meteor/client/views/admin/settings/inputs/AssetSettingInput.stories.tsx
index e2d56a89115..4032e459004 100644
--- a/apps/meteor/client/views/admin/settings/inputs/AssetSettingInput.stories.tsx
+++ b/apps/meteor/client/views/admin/settings/inputs/AssetSettingInput.stories.tsx
@@ -1,5 +1,5 @@
 import { Field } from '@rocket.chat/fuselage';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import AssetSettingInput from './AssetSettingInput';
diff --git a/apps/meteor/client/views/admin/settings/inputs/AssetSettingInput.tsx b/apps/meteor/client/views/admin/settings/inputs/AssetSettingInput.tsx
index ab8e1f54df8..9f2d44d9158 100644
--- a/apps/meteor/client/views/admin/settings/inputs/AssetSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/inputs/AssetSettingInput.tsx
@@ -1,7 +1,8 @@
 import { Button, Field, Icon } from '@rocket.chat/fuselage';
 import { useToastMessageDispatch, useEndpoint, useTranslation, useUpload } from '@rocket.chat/ui-contexts';
 import { Random } from 'meteor/random';
-import React, { ChangeEventHandler, DragEvent, ReactElement } from 'react';
+import type { ChangeEventHandler, DragEvent, ReactElement } from 'react';
+import React from 'react';
 
 import './AssetSettingInput.styles.css';
 
diff --git a/apps/meteor/client/views/admin/settings/inputs/BooleanSettingInput.stories.tsx b/apps/meteor/client/views/admin/settings/inputs/BooleanSettingInput.stories.tsx
index 94aad20095a..6af68ab1a3d 100644
--- a/apps/meteor/client/views/admin/settings/inputs/BooleanSettingInput.stories.tsx
+++ b/apps/meteor/client/views/admin/settings/inputs/BooleanSettingInput.stories.tsx
@@ -1,5 +1,5 @@
 import { Field } from '@rocket.chat/fuselage';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import BooleanSettingInput from './BooleanSettingInput';
diff --git a/apps/meteor/client/views/admin/settings/inputs/BooleanSettingInput.tsx b/apps/meteor/client/views/admin/settings/inputs/BooleanSettingInput.tsx
index 203f88356bf..1a8728ac79c 100644
--- a/apps/meteor/client/views/admin/settings/inputs/BooleanSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/inputs/BooleanSettingInput.tsx
@@ -1,5 +1,6 @@
 import { Field, ToggleSwitch } from '@rocket.chat/fuselage';
-import React, { ReactElement, SyntheticEvent } from 'react';
+import type { ReactElement, SyntheticEvent } from 'react';
+import React from 'react';
 
 import ResetSettingButton from '../ResetSettingButton';
 
diff --git a/apps/meteor/client/views/admin/settings/inputs/CodeMirror.tsx b/apps/meteor/client/views/admin/settings/inputs/CodeMirror.tsx
index 71a10765aa0..28103b5923f 100644
--- a/apps/meteor/client/views/admin/settings/inputs/CodeMirror.tsx
+++ b/apps/meteor/client/views/admin/settings/inputs/CodeMirror.tsx
@@ -1,6 +1,7 @@
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import type { Editor, EditorFromTextArea } from 'codemirror';
-import React, { ReactElement, useEffect, useRef, useState } from 'react';
+import type { ReactElement } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 
 const defaultGutters = ['CodeMirror-linenumbers', 'CodeMirror-foldgutter'];
 
diff --git a/apps/meteor/client/views/admin/settings/inputs/CodeSettingInput.stories.tsx b/apps/meteor/client/views/admin/settings/inputs/CodeSettingInput.stories.tsx
index 1a899b2e6f2..e81e3198535 100644
--- a/apps/meteor/client/views/admin/settings/inputs/CodeSettingInput.stories.tsx
+++ b/apps/meteor/client/views/admin/settings/inputs/CodeSettingInput.stories.tsx
@@ -1,5 +1,5 @@
 import { Field } from '@rocket.chat/fuselage';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import CodeSettingInput from './CodeSettingInput';
diff --git a/apps/meteor/client/views/admin/settings/inputs/CodeSettingInput.tsx b/apps/meteor/client/views/admin/settings/inputs/CodeSettingInput.tsx
index 34cfdb62012..153d807bab7 100644
--- a/apps/meteor/client/views/admin/settings/inputs/CodeSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/inputs/CodeSettingInput.tsx
@@ -1,7 +1,8 @@
 import { Box, Button, Field, Flex } from '@rocket.chat/fuselage';
 import { useToggle } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import ResetSettingButton from '../ResetSettingButton';
 import CodeMirror from './CodeMirror';
diff --git a/apps/meteor/client/views/admin/settings/inputs/ColorSettingInput.stories.tsx b/apps/meteor/client/views/admin/settings/inputs/ColorSettingInput.stories.tsx
index c6f7bb5612a..905fcc3ea13 100644
--- a/apps/meteor/client/views/admin/settings/inputs/ColorSettingInput.stories.tsx
+++ b/apps/meteor/client/views/admin/settings/inputs/ColorSettingInput.stories.tsx
@@ -1,5 +1,5 @@
 import { Field } from '@rocket.chat/fuselage';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import ColorSettingInput from './ColorSettingInput';
diff --git a/apps/meteor/client/views/admin/settings/inputs/ColorSettingInput.tsx b/apps/meteor/client/views/admin/settings/inputs/ColorSettingInput.tsx
index 5d8acfbdcf4..4ca25c0eb40 100644
--- a/apps/meteor/client/views/admin/settings/inputs/ColorSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/inputs/ColorSettingInput.tsx
@@ -1,6 +1,8 @@
 import { Box, Field, Flex, InputBox, Margins, TextInput, Select } from '@rocket.chat/fuselage';
-import { useTranslation, TranslationKey } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useCallback } from 'react';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
+import type { ReactElement } from 'react';
+import React, { useCallback } from 'react';
 
 import ResetSettingButton from '../ResetSettingButton';
 
diff --git a/apps/meteor/client/views/admin/settings/inputs/FontSettingInput.stories.tsx b/apps/meteor/client/views/admin/settings/inputs/FontSettingInput.stories.tsx
index 2da0fb1c512..59e4957e099 100644
--- a/apps/meteor/client/views/admin/settings/inputs/FontSettingInput.stories.tsx
+++ b/apps/meteor/client/views/admin/settings/inputs/FontSettingInput.stories.tsx
@@ -1,5 +1,5 @@
 import { Field } from '@rocket.chat/fuselage';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import FontSettingInput from './FontSettingInput';
diff --git a/apps/meteor/client/views/admin/settings/inputs/FontSettingInput.tsx b/apps/meteor/client/views/admin/settings/inputs/FontSettingInput.tsx
index 5df67013532..2d7a93b9c96 100644
--- a/apps/meteor/client/views/admin/settings/inputs/FontSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/inputs/FontSettingInput.tsx
@@ -1,5 +1,6 @@
 import { Box, Field, Flex, TextInput } from '@rocket.chat/fuselage';
-import React, { FormEventHandler, ReactElement } from 'react';
+import type { FormEventHandler, ReactElement } from 'react';
+import React from 'react';
 
 import ResetSettingButton from '../ResetSettingButton';
 
diff --git a/apps/meteor/client/views/admin/settings/inputs/GenericSettingInput.stories.tsx b/apps/meteor/client/views/admin/settings/inputs/GenericSettingInput.stories.tsx
index 03683ac118f..63239fdf035 100644
--- a/apps/meteor/client/views/admin/settings/inputs/GenericSettingInput.stories.tsx
+++ b/apps/meteor/client/views/admin/settings/inputs/GenericSettingInput.stories.tsx
@@ -1,5 +1,5 @@
 import { Field } from '@rocket.chat/fuselage';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import GenericSettingInput from './GenericSettingInput';
diff --git a/apps/meteor/client/views/admin/settings/inputs/GenericSettingInput.tsx b/apps/meteor/client/views/admin/settings/inputs/GenericSettingInput.tsx
index 974994ff628..46ffc61a8f3 100644
--- a/apps/meteor/client/views/admin/settings/inputs/GenericSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/inputs/GenericSettingInput.tsx
@@ -1,5 +1,6 @@
 import { Box, Field, Flex, TextInput } from '@rocket.chat/fuselage';
-import React, { FormEventHandler, ReactElement } from 'react';
+import type { FormEventHandler, ReactElement } from 'react';
+import React from 'react';
 
 import ResetSettingButton from '../ResetSettingButton';
 
diff --git a/apps/meteor/client/views/admin/settings/inputs/IntSettingInput.stories.tsx b/apps/meteor/client/views/admin/settings/inputs/IntSettingInput.stories.tsx
index 9c535e27c6e..21aedce6f8f 100644
--- a/apps/meteor/client/views/admin/settings/inputs/IntSettingInput.stories.tsx
+++ b/apps/meteor/client/views/admin/settings/inputs/IntSettingInput.stories.tsx
@@ -1,5 +1,5 @@
 import { Field } from '@rocket.chat/fuselage';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import IntSettingInput from './IntSettingInput';
diff --git a/apps/meteor/client/views/admin/settings/inputs/IntSettingInput.tsx b/apps/meteor/client/views/admin/settings/inputs/IntSettingInput.tsx
index 4a525788714..03f83711722 100644
--- a/apps/meteor/client/views/admin/settings/inputs/IntSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/inputs/IntSettingInput.tsx
@@ -1,5 +1,6 @@
 import { Box, Field, Flex, InputBox } from '@rocket.chat/fuselage';
-import React, { FormEventHandler, ReactElement } from 'react';
+import type { FormEventHandler, ReactElement } from 'react';
+import React from 'react';
 
 import ResetSettingButton from '../ResetSettingButton';
 
diff --git a/apps/meteor/client/views/admin/settings/inputs/LanguageSettingInput.stories.tsx b/apps/meteor/client/views/admin/settings/inputs/LanguageSettingInput.stories.tsx
index 87b78d8aae3..c063ca082ac 100644
--- a/apps/meteor/client/views/admin/settings/inputs/LanguageSettingInput.stories.tsx
+++ b/apps/meteor/client/views/admin/settings/inputs/LanguageSettingInput.stories.tsx
@@ -1,5 +1,5 @@
 import { Field } from '@rocket.chat/fuselage';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import LanguageSettingInput from './LanguageSettingInput';
diff --git a/apps/meteor/client/views/admin/settings/inputs/LanguageSettingInput.tsx b/apps/meteor/client/views/admin/settings/inputs/LanguageSettingInput.tsx
index 850444f2a76..46560601ec4 100644
--- a/apps/meteor/client/views/admin/settings/inputs/LanguageSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/inputs/LanguageSettingInput.tsx
@@ -1,6 +1,7 @@
 import { Box, Field, Flex, Select } from '@rocket.chat/fuselage';
 import { useLanguages } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import ResetSettingButton from '../ResetSettingButton';
 
diff --git a/apps/meteor/client/views/admin/settings/inputs/LookupSettingInput.tsx b/apps/meteor/client/views/admin/settings/inputs/LookupSettingInput.tsx
index be8db62c1dc..dc8c71d8edf 100644
--- a/apps/meteor/client/views/admin/settings/inputs/LookupSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/inputs/LookupSettingInput.tsx
@@ -1,8 +1,9 @@
 import { Box, Field, Flex, Select } from '@rocket.chat/fuselage';
 import type { PathFor } from '@rocket.chat/rest-typings';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
-import { AsyncState } from '../../../../hooks/useAsyncState';
+import type { AsyncState } from '../../../../hooks/useAsyncState';
 import { useEndpointData } from '../../../../hooks/useEndpointData';
 import ResetSettingButton from '../ResetSettingButton';
 
diff --git a/apps/meteor/client/views/admin/settings/inputs/MultiSelectSettingInput.stories.tsx b/apps/meteor/client/views/admin/settings/inputs/MultiSelectSettingInput.stories.tsx
index 02dde5261c4..3b4eb152627 100644
--- a/apps/meteor/client/views/admin/settings/inputs/MultiSelectSettingInput.stories.tsx
+++ b/apps/meteor/client/views/admin/settings/inputs/MultiSelectSettingInput.stories.tsx
@@ -1,9 +1,10 @@
 import { Field } from '@rocket.chat/fuselage';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import type keys from '../../../../../packages/rocketchat-i18n/i18n/en.i18n.json';
-import MultiSelectSettingInput, { valuesOption } from './MultiSelectSettingInput';
+import type { valuesOption } from './MultiSelectSettingInput';
+import MultiSelectSettingInput from './MultiSelectSettingInput';
 
 export default {
 	title: 'Admin/Settings/Inputs/MultiSelectSettingInput',
diff --git a/apps/meteor/client/views/admin/settings/inputs/MultiSelectSettingInput.tsx b/apps/meteor/client/views/admin/settings/inputs/MultiSelectSettingInput.tsx
index a628d27abdc..114503c959e 100644
--- a/apps/meteor/client/views/admin/settings/inputs/MultiSelectSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/inputs/MultiSelectSettingInput.tsx
@@ -1,6 +1,8 @@
 import { Field, Flex, Box, MultiSelectFiltered, MultiSelect } from '@rocket.chat/fuselage';
-import { useTranslation, TranslationKey } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import ResetSettingButton from '../ResetSettingButton';
 
diff --git a/apps/meteor/client/views/admin/settings/inputs/PasswordSettingInput.stories.tsx b/apps/meteor/client/views/admin/settings/inputs/PasswordSettingInput.stories.tsx
index 4b92d8cfd2f..450c0aa10bf 100644
--- a/apps/meteor/client/views/admin/settings/inputs/PasswordSettingInput.stories.tsx
+++ b/apps/meteor/client/views/admin/settings/inputs/PasswordSettingInput.stories.tsx
@@ -1,5 +1,5 @@
 import { Field } from '@rocket.chat/fuselage';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import PasswordSettingInput from './PasswordSettingInput';
diff --git a/apps/meteor/client/views/admin/settings/inputs/PasswordSettingInput.tsx b/apps/meteor/client/views/admin/settings/inputs/PasswordSettingInput.tsx
index 51f3313a2e8..6fe402cd7db 100644
--- a/apps/meteor/client/views/admin/settings/inputs/PasswordSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/inputs/PasswordSettingInput.tsx
@@ -1,5 +1,6 @@
 import { Box, Field, Flex, PasswordInput } from '@rocket.chat/fuselage';
-import React, { EventHandler, ReactElement, SyntheticEvent } from 'react';
+import type { EventHandler, ReactElement, SyntheticEvent } from 'react';
+import React from 'react';
 
 import ResetSettingButton from '../ResetSettingButton';
 
diff --git a/apps/meteor/client/views/admin/settings/inputs/RelativeUrlSettingInput.stories.tsx b/apps/meteor/client/views/admin/settings/inputs/RelativeUrlSettingInput.stories.tsx
index 7d9b15d01ae..4fc9e5d7275 100644
--- a/apps/meteor/client/views/admin/settings/inputs/RelativeUrlSettingInput.stories.tsx
+++ b/apps/meteor/client/views/admin/settings/inputs/RelativeUrlSettingInput.stories.tsx
@@ -1,5 +1,5 @@
 import { Field } from '@rocket.chat/fuselage';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import RelativeUrlSettingInput from './RelativeUrlSettingInput';
diff --git a/apps/meteor/client/views/admin/settings/inputs/RelativeUrlSettingInput.tsx b/apps/meteor/client/views/admin/settings/inputs/RelativeUrlSettingInput.tsx
index b7bfd80f39e..0541ea81eb3 100644
--- a/apps/meteor/client/views/admin/settings/inputs/RelativeUrlSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/inputs/RelativeUrlSettingInput.tsx
@@ -1,6 +1,7 @@
 import { Box, Field, Flex, UrlInput } from '@rocket.chat/fuselage';
 import { useAbsoluteUrl } from '@rocket.chat/ui-contexts';
-import React, { EventHandler, ReactElement, SyntheticEvent } from 'react';
+import type { EventHandler, ReactElement, SyntheticEvent } from 'react';
+import React from 'react';
 
 import ResetSettingButton from '../ResetSettingButton';
 
diff --git a/apps/meteor/client/views/admin/settings/inputs/RoomPickSettingInput.tsx b/apps/meteor/client/views/admin/settings/inputs/RoomPickSettingInput.tsx
index 279f30428c8..316a7425c36 100644
--- a/apps/meteor/client/views/admin/settings/inputs/RoomPickSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/inputs/RoomPickSettingInput.tsx
@@ -1,7 +1,8 @@
 import { Box, Field, Flex, Icon } from '@rocket.chat/fuselage';
 import { Blaze } from 'meteor/blaze';
 import { Template } from 'meteor/templating';
-import React, { useRef, useEffect, useLayoutEffect, ReactElement, MutableRefObject } from 'react';
+import type { ReactElement, MutableRefObject } from 'react';
+import React, { useRef, useEffect, useLayoutEffect } from 'react';
 
 import ResetSettingButton from '../ResetSettingButton';
 
diff --git a/apps/meteor/client/views/admin/settings/inputs/SelectSettingInput.stories.tsx b/apps/meteor/client/views/admin/settings/inputs/SelectSettingInput.stories.tsx
index 4a45a5cc89f..e08f376be0f 100644
--- a/apps/meteor/client/views/admin/settings/inputs/SelectSettingInput.stories.tsx
+++ b/apps/meteor/client/views/admin/settings/inputs/SelectSettingInput.stories.tsx
@@ -1,5 +1,5 @@
 import { Field } from '@rocket.chat/fuselage';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import type keys from '../../../../../packages/rocketchat-i18n/i18n/en.i18n.json';
diff --git a/apps/meteor/client/views/admin/settings/inputs/SelectSettingInput.tsx b/apps/meteor/client/views/admin/settings/inputs/SelectSettingInput.tsx
index 04f6516cd92..212633d2e43 100644
--- a/apps/meteor/client/views/admin/settings/inputs/SelectSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/inputs/SelectSettingInput.tsx
@@ -1,6 +1,8 @@
 import { Box, Field, Flex, Select } from '@rocket.chat/fuselage';
-import { TranslationKey, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import ResetSettingButton from '../ResetSettingButton';
 
diff --git a/apps/meteor/client/views/admin/settings/inputs/SelectTimezoneSettingInput.tsx b/apps/meteor/client/views/admin/settings/inputs/SelectTimezoneSettingInput.tsx
index 0ad6cef76b2..b1e4559bc1c 100644
--- a/apps/meteor/client/views/admin/settings/inputs/SelectTimezoneSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/inputs/SelectTimezoneSettingInput.tsx
@@ -1,6 +1,7 @@
 import { Box, Field, Flex, Select } from '@rocket.chat/fuselage';
 import moment from 'moment-timezone';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import ResetSettingButton from '../ResetSettingButton';
 
diff --git a/apps/meteor/client/views/admin/settings/inputs/StringSettingInput.stories.tsx b/apps/meteor/client/views/admin/settings/inputs/StringSettingInput.stories.tsx
index 9cd543b1083..dbe63a8e8d2 100644
--- a/apps/meteor/client/views/admin/settings/inputs/StringSettingInput.stories.tsx
+++ b/apps/meteor/client/views/admin/settings/inputs/StringSettingInput.stories.tsx
@@ -1,5 +1,5 @@
 import { Field } from '@rocket.chat/fuselage';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import StringSettingInput from './StringSettingInput';
diff --git a/apps/meteor/client/views/admin/settings/inputs/StringSettingInput.tsx b/apps/meteor/client/views/admin/settings/inputs/StringSettingInput.tsx
index a38545666fe..cc83dc66771 100644
--- a/apps/meteor/client/views/admin/settings/inputs/StringSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/inputs/StringSettingInput.tsx
@@ -1,5 +1,6 @@
 import { Box, Field, Flex, TextAreaInput, TextInput } from '@rocket.chat/fuselage';
-import React, { EventHandler, ReactElement, SyntheticEvent } from 'react';
+import type { EventHandler, ReactElement, SyntheticEvent } from 'react';
+import React from 'react';
 
 import ResetSettingButton from '../ResetSettingButton';
 
diff --git a/apps/meteor/client/views/admin/sidebar/AdminSidebar.tsx b/apps/meteor/client/views/admin/sidebar/AdminSidebar.tsx
index 81fb06f8ce9..de2ab95e875 100644
--- a/apps/meteor/client/views/admin/sidebar/AdminSidebar.tsx
+++ b/apps/meteor/client/views/admin/sidebar/AdminSidebar.tsx
@@ -1,5 +1,6 @@
 import { useRoutePath, useCurrentRoute, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useCallback, useEffect, memo, FC } from 'react';
+import type { FC } from 'react';
+import React, { useCallback, useEffect, memo } from 'react';
 
 import { menu, SideNav } from '../../../../app/ui-utils/client';
 import PlanTag from '../../../components/PlanTag';
diff --git a/apps/meteor/client/views/admin/sidebar/AdminSidebarPages.tsx b/apps/meteor/client/views/admin/sidebar/AdminSidebarPages.tsx
index 664c18838c6..cc670f83f73 100644
--- a/apps/meteor/client/views/admin/sidebar/AdminSidebarPages.tsx
+++ b/apps/meteor/client/views/admin/sidebar/AdminSidebarPages.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { memo, FC } from 'react';
+import type { FC } from 'react';
+import React, { memo } from 'react';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
 
 import SidebarItemsAssembler from '../../../components/Sidebar/SidebarItemsAssembler';
diff --git a/apps/meteor/client/views/admin/sidebar/UpgradeTab.tsx b/apps/meteor/client/views/admin/sidebar/UpgradeTab.tsx
index b64c5ba0e8d..bb9a14292b2 100644
--- a/apps/meteor/client/views/admin/sidebar/UpgradeTab.tsx
+++ b/apps/meteor/client/views/admin/sidebar/UpgradeTab.tsx
@@ -1,9 +1,11 @@
 import { Box, Icon } from '@rocket.chat/fuselage';
 import colors from '@rocket.chat/fuselage-tokens/colors';
 import { useRoutePath, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useMemo } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo } from 'react';
 
-import { getUpgradeTabLabel, isFullyFeature, UpgradeTabVariant } from '../../../../lib/upgradeTab';
+import type { UpgradeTabVariant } from '../../../../lib/upgradeTab';
+import { getUpgradeTabLabel, isFullyFeature } from '../../../../lib/upgradeTab';
 import Emoji from '../../../components/Emoji';
 import Sidebar from '../../../components/Sidebar';
 
diff --git a/apps/meteor/client/views/admin/upgrade/UpgradePage/UpgradePage.tsx b/apps/meteor/client/views/admin/upgrade/UpgradePage/UpgradePage.tsx
index 7950dce0890..e7fbdcd49bb 100644
--- a/apps/meteor/client/views/admin/upgrade/UpgradePage/UpgradePage.tsx
+++ b/apps/meteor/client/views/admin/upgrade/UpgradePage/UpgradePage.tsx
@@ -1,6 +1,7 @@
 import { Throbber, Box } from '@rocket.chat/fuselage';
 import { useLayout, useRouteParameter, useQueryStringParameter, useAbsoluteUrl, useLanguage } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useEffect, useRef, useState } from 'react';
+import type { ReactElement } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 
 import type { UpgradeTabVariant } from '../../../../../lib/upgradeTab';
 import Page from '../../../../components/Page';
diff --git a/apps/meteor/client/views/admin/upgrade/UpgradePageError/UpgradePageError.tsx b/apps/meteor/client/views/admin/upgrade/UpgradePageError/UpgradePageError.tsx
index 653be092a47..d74799890b6 100644
--- a/apps/meteor/client/views/admin/upgrade/UpgradePageError/UpgradePageError.tsx
+++ b/apps/meteor/client/views/admin/upgrade/UpgradePageError/UpgradePageError.tsx
@@ -1,6 +1,7 @@
 import { States, StatesIcon, StatesSubtitle, StatesTitle, StatesActions, Button, Icon, Box } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 const UpgradePageError = (): ReactElement => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/admin/users/AdminUserInfoActions.tsx b/apps/meteor/client/views/admin/users/AdminUserInfoActions.tsx
index 124dcbac9fb..2c2c9ea1ffa 100644
--- a/apps/meteor/client/views/admin/users/AdminUserInfoActions.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserInfoActions.tsx
@@ -1,7 +1,8 @@
-import { IUser } from '@rocket.chat/core-typings';
+import type { IUser } from '@rocket.chat/core-typings';
 import { ButtonGroup, Menu, Option } from '@rocket.chat/fuselage';
 import { useRoute, usePermission, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useCallback, useMemo, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useCallback, useMemo } from 'react';
 
 import UserInfo from '../../../components/UserInfo';
 import { useActionSpread } from '../../hooks/useActionSpread';
diff --git a/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx b/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx
index 3cb2efebc81..2a571216507 100644
--- a/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx
@@ -1,8 +1,9 @@
-import { IUser } from '@rocket.chat/core-typings';
+import type { IUser } from '@rocket.chat/core-typings';
 import { Callout } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useSetting, useRolesDescription, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useMemo, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo } from 'react';
 
 import { getUserEmailAddress } from '../../../../lib/getUserEmailAddress';
 import { FormSkeleton } from '../../../components/Skeleton';
diff --git a/apps/meteor/client/views/admin/users/EditUserWithData.tsx b/apps/meteor/client/views/admin/users/EditUserWithData.tsx
index f42dd33bd69..c048dd824a2 100644
--- a/apps/meteor/client/views/admin/users/EditUserWithData.tsx
+++ b/apps/meteor/client/views/admin/users/EditUserWithData.tsx
@@ -1,7 +1,9 @@
-import { isUserFederated, IUser } from '@rocket.chat/core-typings';
+import type { IUser } from '@rocket.chat/core-typings';
+import { isUserFederated } from '@rocket.chat/core-typings';
 import { Box, Callout } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useMemo, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo } from 'react';
 
 import { FormSkeleton } from '../../../components/Skeleton';
 import { AsyncStatePhase } from '../../../hooks/useAsyncState';
diff --git a/apps/meteor/client/views/admin/users/InviteUsers.tsx b/apps/meteor/client/views/admin/users/InviteUsers.tsx
index 50ed191d24f..6bacfbabf56 100644
--- a/apps/meteor/client/views/admin/users/InviteUsers.tsx
+++ b/apps/meteor/client/views/admin/users/InviteUsers.tsx
@@ -1,6 +1,7 @@
 import { Box, Button, Icon, TextAreaInput } from '@rocket.chat/fuselage';
 import { useToastMessageDispatch, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useCallback, useState, ReactElement, ChangeEvent, ComponentProps } from 'react';
+import type { ReactElement, ChangeEvent, ComponentProps } from 'react';
+import React, { useCallback, useState } from 'react';
 
 import { validateEmail } from '../../../../lib/emailValidator';
 import VerticalBar from '../../../components/VerticalBar';
diff --git a/apps/meteor/client/views/admin/users/UsersPage.tsx b/apps/meteor/client/views/admin/users/UsersPage.tsx
index b782ced2c3a..224bcdca83d 100644
--- a/apps/meteor/client/views/admin/users/UsersPage.tsx
+++ b/apps/meteor/client/views/admin/users/UsersPage.tsx
@@ -1,6 +1,7 @@
 import { Button, ButtonGroup, Icon } from '@rocket.chat/fuselage';
 import { usePermission, useRoute, useRouteParameter, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useEffect, ReactElement, useRef } from 'react';
+import type { ReactElement } from 'react';
+import React, { useEffect, useRef } from 'react';
 
 import UserPageHeaderContentWithSeatsCap from '../../../../ee/client/views/admin/users/UserPageHeaderContentWithSeatsCap';
 import { useSeatsCap } from '../../../../ee/client/views/admin/users/useSeatsCap';
diff --git a/apps/meteor/client/views/admin/users/UsersRoute.tsx b/apps/meteor/client/views/admin/users/UsersRoute.tsx
index ace289e93db..db8da03ad6d 100644
--- a/apps/meteor/client/views/admin/users/UsersRoute.tsx
+++ b/apps/meteor/client/views/admin/users/UsersRoute.tsx
@@ -1,5 +1,6 @@
 import { usePermission } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 import UsersPage from './UsersPage';
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
index ff524579f3a..e5d09e83689 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
@@ -1,7 +1,8 @@
 import { States, StatesIcon, StatesTitle, Pagination } from '@rocket.chat/fuselage';
 import { useMediaQuery, useDebouncedValue, useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useRoute, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useMemo, MutableRefObject, useState, useEffect } from 'react';
+import type { ReactElement, MutableRefObject } from 'react';
+import React, { useMemo, useState, useEffect } from 'react';
 
 import FilterByText from '../../../../components/FilterByText';
 import {
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
index a7157802391..2f63539a358 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
@@ -1,8 +1,10 @@
-import { IRole, IUser } from '@rocket.chat/core-typings';
+import type { IRole, IUser } from '@rocket.chat/core-typings';
 import { Box, TableRow, TableCell } from '@rocket.chat/fuselage';
 import { capitalize } from '@rocket.chat/string-helpers';
-import { useTranslation, TranslationKey } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { Roles } from '../../../../../app/models/client';
 import UserAvatar from '../../../../components/avatar/UserAvatar';
diff --git a/apps/meteor/client/views/admin/users/hooks/useChangeAdminStatusAction.ts b/apps/meteor/client/views/admin/users/hooks/useChangeAdminStatusAction.ts
index 9918b1d4d0f..4e179dfb327 100644
--- a/apps/meteor/client/views/admin/users/hooks/useChangeAdminStatusAction.ts
+++ b/apps/meteor/client/views/admin/users/hooks/useChangeAdminStatusAction.ts
@@ -1,8 +1,8 @@
-import { IUser } from '@rocket.chat/core-typings';
+import type { IUser } from '@rocket.chat/core-typings';
 import { useToastMessageDispatch, useMethod, useTranslation, usePermission } from '@rocket.chat/ui-contexts';
 import { useCallback } from 'react';
 
-import { Action } from '../../../hooks/useActionSpread';
+import type { Action } from '../../../hooks/useActionSpread';
 
 export const useChangeAdminStatusAction = (userId: IUser['_id'], isAdmin: boolean, onChange: () => void): Action | undefined => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/admin/users/hooks/useChangeUserStatusAction.ts b/apps/meteor/client/views/admin/users/hooks/useChangeUserStatusAction.ts
index 7e5a3e74b30..523c8d36a8f 100644
--- a/apps/meteor/client/views/admin/users/hooks/useChangeUserStatusAction.ts
+++ b/apps/meteor/client/views/admin/users/hooks/useChangeUserStatusAction.ts
@@ -1,8 +1,8 @@
-import { IUser } from '@rocket.chat/core-typings';
+import type { IUser } from '@rocket.chat/core-typings';
 import { useToastMessageDispatch, useTranslation, useEndpoint, usePermission } from '@rocket.chat/ui-contexts';
 import { useMemo } from 'react';
 
-import { Action } from '../../../hooks/useActionSpread';
+import type { Action } from '../../../hooks/useActionSpread';
 import { useConfirmOwnerChanges } from './useConfirmOwnerChanges';
 
 export const useChangeUserStatusAction = (userId: IUser['_id'], isActive: boolean, onChange: () => void): Action | undefined => {
diff --git a/apps/meteor/client/views/admin/users/hooks/useConfirmOwnerChanges.tsx b/apps/meteor/client/views/admin/users/hooks/useConfirmOwnerChanges.tsx
index b250ed7dcc1..0cf1d124b10 100644
--- a/apps/meteor/client/views/admin/users/hooks/useConfirmOwnerChanges.tsx
+++ b/apps/meteor/client/views/admin/users/hooks/useConfirmOwnerChanges.tsx
@@ -1,5 +1,6 @@
 import { useSetModal, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
-import React, { ComponentProps } from 'react';
+import type { ComponentProps } from 'react';
+import React from 'react';
 
 import ConfirmOwnerChangeWarningModal from '../../../../components/ConfirmOwnerChangeModal';
 
diff --git a/apps/meteor/client/views/admin/users/hooks/useDeleteUserAction.tsx b/apps/meteor/client/views/admin/users/hooks/useDeleteUserAction.tsx
index 1a45dafee94..90d7bec28ed 100644
--- a/apps/meteor/client/views/admin/users/hooks/useDeleteUserAction.tsx
+++ b/apps/meteor/client/views/admin/users/hooks/useDeleteUserAction.tsx
@@ -1,5 +1,6 @@
-import { IUser } from '@rocket.chat/core-typings';
+import type { IUser } from '@rocket.chat/core-typings';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import {
 	useSetModal,
 	useToastMessageDispatch,
@@ -8,12 +9,11 @@ import {
 	usePermission,
 	useEndpoint,
 	useTranslation,
-	TranslationKey,
 } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
 
 import GenericModal from '../../../../components/GenericModal';
-import { Action } from '../../../hooks/useActionSpread';
+import type { Action } from '../../../hooks/useActionSpread';
 import { useConfirmOwnerChanges } from './useConfirmOwnerChanges';
 
 export const useDeleteUserAction = (userId: IUser['_id'], onChange: () => void, onReload: () => void): Action | undefined => {
diff --git a/apps/meteor/client/views/admin/users/hooks/useResetE2EEKeyAction.tsx b/apps/meteor/client/views/admin/users/hooks/useResetE2EEKeyAction.tsx
index 83314de1450..b6c868df3d7 100644
--- a/apps/meteor/client/views/admin/users/hooks/useResetE2EEKeyAction.tsx
+++ b/apps/meteor/client/views/admin/users/hooks/useResetE2EEKeyAction.tsx
@@ -1,9 +1,9 @@
-import { IUser } from '@rocket.chat/core-typings';
+import type { IUser } from '@rocket.chat/core-typings';
 import { useSetModal, useSetting, usePermission, useEndpoint, useTranslation, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import React, { useCallback } from 'react';
 
 import GenericModal from '../../../../components/GenericModal';
-import { Action } from '../../../hooks/useActionSpread';
+import type { Action } from '../../../hooks/useActionSpread';
 
 export const useResetE2EEKeyAction = (userId: IUser['_id']): Action | undefined => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/admin/users/hooks/useResetTOTPAction.tsx b/apps/meteor/client/views/admin/users/hooks/useResetTOTPAction.tsx
index d846bed47e1..68e59ecff81 100644
--- a/apps/meteor/client/views/admin/users/hooks/useResetTOTPAction.tsx
+++ b/apps/meteor/client/views/admin/users/hooks/useResetTOTPAction.tsx
@@ -1,9 +1,9 @@
-import { IUser } from '@rocket.chat/core-typings';
+import type { IUser } from '@rocket.chat/core-typings';
 import { useSetModal, useSetting, usePermission, useEndpoint, useTranslation, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import React, { useCallback } from 'react';
 
 import GenericModal from '../../../../components/GenericModal';
-import { Action } from '../../../hooks/useActionSpread';
+import type { Action } from '../../../hooks/useActionSpread';
 
 export const useResetTOTPAction = (userId: IUser['_id']): Action | undefined => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/admin/viewLogs/ServerLogs.tsx b/apps/meteor/client/views/admin/viewLogs/ServerLogs.tsx
index d9e9f95459d..dbcf9b27897 100644
--- a/apps/meteor/client/views/admin/viewLogs/ServerLogs.tsx
+++ b/apps/meteor/client/views/admin/viewLogs/ServerLogs.tsx
@@ -1,7 +1,8 @@
-import { Serialized } from '@rocket.chat/core-typings';
+import type { Serialized } from '@rocket.chat/core-typings';
 import { Box, Icon, Scrollable } from '@rocket.chat/fuselage';
 import { useToastMessageDispatch, useEndpoint, useStream, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useEffect, useRef, useState, useCallback, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useEffect, useRef, useState, useCallback } from 'react';
 
 import { ansispan } from './ansispan';
 
diff --git a/apps/meteor/client/views/admin/viewLogs/ViewLogsPage.stories.tsx b/apps/meteor/client/views/admin/viewLogs/ViewLogsPage.stories.tsx
index d0fa0040029..131d3373e11 100644
--- a/apps/meteor/client/views/admin/viewLogs/ViewLogsPage.stories.tsx
+++ b/apps/meteor/client/views/admin/viewLogs/ViewLogsPage.stories.tsx
@@ -1,5 +1,6 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
-import React, { ReactElement, ReactNode } from 'react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ReactElement, ReactNode } from 'react';
+import React from 'react';
 
 import ViewLogsPage from './ViewLogsPage';
 
diff --git a/apps/meteor/client/views/admin/viewLogs/ViewLogsPage.tsx b/apps/meteor/client/views/admin/viewLogs/ViewLogsPage.tsx
index 74e6e20cec1..5d86658f297 100644
--- a/apps/meteor/client/views/admin/viewLogs/ViewLogsPage.tsx
+++ b/apps/meteor/client/views/admin/viewLogs/ViewLogsPage.tsx
@@ -1,5 +1,6 @@
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import Page from '../../../components/Page';
 import ServerLogs from './ServerLogs';
diff --git a/apps/meteor/client/views/admin/viewLogs/ViewLogsRoute.tsx b/apps/meteor/client/views/admin/viewLogs/ViewLogsRoute.tsx
index 271245f2090..130ddf067f5 100644
--- a/apps/meteor/client/views/admin/viewLogs/ViewLogsRoute.tsx
+++ b/apps/meteor/client/views/admin/viewLogs/ViewLogsRoute.tsx
@@ -1,5 +1,6 @@
 import { usePermission } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 import ViewLogsPage from './ViewLogsPage';
diff --git a/apps/meteor/client/views/banners/BannerRegion.tsx b/apps/meteor/client/views/banners/BannerRegion.tsx
index a840540482b..c526caf354d 100644
--- a/apps/meteor/client/views/banners/BannerRegion.tsx
+++ b/apps/meteor/client/views/banners/BannerRegion.tsx
@@ -1,4 +1,5 @@
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
 
 import * as banners from '../../lib/banners';
diff --git a/apps/meteor/client/views/banners/LegacyBanner.tsx b/apps/meteor/client/views/banners/LegacyBanner.tsx
index b3930962d73..b08d0b4d52f 100644
--- a/apps/meteor/client/views/banners/LegacyBanner.tsx
+++ b/apps/meteor/client/views/banners/LegacyBanner.tsx
@@ -1,7 +1,8 @@
 import { Banner, Icon } from '@rocket.chat/fuselage';
-import React, { FC, useCallback, useEffect } from 'react';
+import type { FC } from 'react';
+import React, { useCallback, useEffect } from 'react';
 
-import { LegacyBannerPayload } from '../../lib/banners';
+import type { LegacyBannerPayload } from '../../lib/banners';
 import * as banners from '../../lib/banners';
 
 type LegacyBannerProps = {
diff --git a/apps/meteor/client/views/banners/UiKitBanner.tsx b/apps/meteor/client/views/banners/UiKitBanner.tsx
index df4280e9042..d7f55f370e4 100644
--- a/apps/meteor/client/views/banners/UiKitBanner.tsx
+++ b/apps/meteor/client/views/banners/UiKitBanner.tsx
@@ -1,8 +1,9 @@
-import { UIKitActionEvent, UiKitBannerProps } from '@rocket.chat/core-typings';
+import type { UIKitActionEvent, UiKitBannerProps } from '@rocket.chat/core-typings';
 import { Banner, Icon } from '@rocket.chat/fuselage';
 import { kitContext, bannerParser, UiKitBanner as renderUiKitBannerBlocks } from '@rocket.chat/fuselage-ui-kit';
-import { LayoutBlock } from '@rocket.chat/ui-kit';
-import React, { FC, useMemo, ComponentProps, ReactElement, ContextType } from 'react';
+import type { LayoutBlock } from '@rocket.chat/ui-kit';
+import type { FC, ComponentProps, ReactElement, ContextType } from 'react';
+import React, { useMemo } from 'react';
 
 import { useUIKitHandleAction } from '../../UIKit/hooks/useUIKitHandleAction';
 import { useUIKitHandleClose } from '../../UIKit/hooks/useUIKitHandleClose';
diff --git a/apps/meteor/client/views/composer/AudioMessageRecorder/AudioMessageRecorder.tsx b/apps/meteor/client/views/composer/AudioMessageRecorder/AudioMessageRecorder.tsx
index d35c9b07572..745c00980d0 100644
--- a/apps/meteor/client/views/composer/AudioMessageRecorder/AudioMessageRecorder.tsx
+++ b/apps/meteor/client/views/composer/AudioMessageRecorder/AudioMessageRecorder.tsx
@@ -1,11 +1,12 @@
-import { IMessage, IRoom } from '@rocket.chat/core-typings';
+import type { IMessage, IRoom } from '@rocket.chat/core-typings';
 import { Icon, Throbber } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useSetting, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useEffect, useMemo, useState } from 'react';
+import type { ReactElement } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 
 import { AudioRecorder, UserAction, USER_ACTIVITIES } from '../../../../app/ui/client';
-import { ChatAPI } from '../../../lib/chats/ChatAPI';
+import type { ChatAPI } from '../../../lib/chats/ChatAPI';
 import { useChat } from '../../room/contexts/ChatContext';
 
 const audioRecorder = new AudioRecorder();
diff --git a/apps/meteor/client/views/directory/ChannelsTab.tsx b/apps/meteor/client/views/directory/ChannelsTab.tsx
index 532c4223b85..3ba0a23f8b1 100644
--- a/apps/meteor/client/views/directory/ChannelsTab.tsx
+++ b/apps/meteor/client/views/directory/ChannelsTab.tsx
@@ -1,5 +1,6 @@
 import { usePermission } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import NotAuthorizedPage from '../notAuthorized/NotAuthorizedPage';
 import ChannelsTable from './ChannelsTable';
diff --git a/apps/meteor/client/views/directory/DirectoryPage.tsx b/apps/meteor/client/views/directory/DirectoryPage.tsx
index bcc44af2769..8c7018e3473 100644
--- a/apps/meteor/client/views/directory/DirectoryPage.tsx
+++ b/apps/meteor/client/views/directory/DirectoryPage.tsx
@@ -1,6 +1,7 @@
 import { Tabs } from '@rocket.chat/fuselage';
 import { useCurrentRoute, useRoute, useRouteParameter, useSetting, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useEffect, useCallback, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useEffect, useCallback } from 'react';
 
 import Page from '../../components/Page';
 import ChannelsTab from './ChannelsTab';
diff --git a/apps/meteor/client/views/directory/RoomTags.tsx b/apps/meteor/client/views/directory/RoomTags.tsx
index 4c7df620b04..58a410faf7d 100644
--- a/apps/meteor/client/views/directory/RoomTags.tsx
+++ b/apps/meteor/client/views/directory/RoomTags.tsx
@@ -1,7 +1,8 @@
-import { IRoom } from '@rocket.chat/core-typings';
+import type { IRoom } from '@rocket.chat/core-typings';
 import { Box, Margins, Tag } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 function RoomTags({ room }: { room: IRoom }): ReactElement {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/directory/TeamsTab.tsx b/apps/meteor/client/views/directory/TeamsTab.tsx
index ca9329c977c..0a3d4df1389 100644
--- a/apps/meteor/client/views/directory/TeamsTab.tsx
+++ b/apps/meteor/client/views/directory/TeamsTab.tsx
@@ -1,5 +1,6 @@
 import { usePermission } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import NotAuthorizedPage from '../notAuthorized/NotAuthorizedPage';
 import TeamsTable from './TeamsTable';
diff --git a/apps/meteor/client/views/directory/UserTab.tsx b/apps/meteor/client/views/directory/UserTab.tsx
index ccdebfee6dc..651958bcc79 100644
--- a/apps/meteor/client/views/directory/UserTab.tsx
+++ b/apps/meteor/client/views/directory/UserTab.tsx
@@ -1,5 +1,6 @@
 import { usePermission } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import NotAuthorizedPage from '../notAuthorized/NotAuthorizedPage';
 import UserTable from './UserTable';
diff --git a/apps/meteor/client/views/e2e/EnterE2EPasswordModal.tsx b/apps/meteor/client/views/e2e/EnterE2EPasswordModal.tsx
index 21434238ac5..2716eca597c 100644
--- a/apps/meteor/client/views/e2e/EnterE2EPasswordModal.tsx
+++ b/apps/meteor/client/views/e2e/EnterE2EPasswordModal.tsx
@@ -1,7 +1,8 @@
 import { Box, PasswordInput, Field, FieldGroup } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useState, useCallback } from 'react';
+import type { ReactElement } from 'react';
+import React, { useState, useCallback } from 'react';
 
 import GenericModal from '../../components/GenericModal';
 
diff --git a/apps/meteor/client/views/e2e/SaveE2EPasswordModal.tsx b/apps/meteor/client/views/e2e/SaveE2EPasswordModal.tsx
index 167409eb62d..011ad11bc29 100644
--- a/apps/meteor/client/views/e2e/SaveE2EPasswordModal.tsx
+++ b/apps/meteor/client/views/e2e/SaveE2EPasswordModal.tsx
@@ -1,6 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import GenericModal from '../../components/GenericModal';
 
diff --git a/apps/meteor/client/views/home/CustomHomePage.tsx b/apps/meteor/client/views/home/CustomHomePage.tsx
index c42aeca3fc7..ede3d6b3775 100644
--- a/apps/meteor/client/views/home/CustomHomePage.tsx
+++ b/apps/meteor/client/views/home/CustomHomePage.tsx
@@ -1,4 +1,5 @@
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import Page from '../../components/Page/Page';
 import PageScrollableContentWithShadow from '../../components/Page/PageScrollableContentWithShadow';
diff --git a/apps/meteor/client/views/home/CustomHomePageContent.tsx b/apps/meteor/client/views/home/CustomHomePageContent.tsx
index c86ffe37082..babbc43c9e9 100644
--- a/apps/meteor/client/views/home/CustomHomePageContent.tsx
+++ b/apps/meteor/client/views/home/CustomHomePageContent.tsx
@@ -1,6 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
 import { useSetting } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 const CustomHomePageContent = (): ReactElement | null => {
 	const body = String(useSetting('Layout_Home_Body'));
diff --git a/apps/meteor/client/views/home/DefaultHomePage.tsx b/apps/meteor/client/views/home/DefaultHomePage.tsx
index 634621b50d3..d0215d940b2 100644
--- a/apps/meteor/client/views/home/DefaultHomePage.tsx
+++ b/apps/meteor/client/views/home/DefaultHomePage.tsx
@@ -1,6 +1,7 @@
 import { Box, Grid } from '@rocket.chat/fuselage';
 import { usePermission, useAtLeastOnePermission, useSetting, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import Page from '../../components/Page/Page';
 import PageScrollableContent from '../../components/Page/PageScrollableContent';
diff --git a/apps/meteor/client/views/home/HomePage.tsx b/apps/meteor/client/views/home/HomePage.tsx
index 348713bcb15..667afa9286c 100644
--- a/apps/meteor/client/views/home/HomePage.tsx
+++ b/apps/meteor/client/views/home/HomePage.tsx
@@ -1,5 +1,6 @@
 import { useSetting } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import CustomHomePage from './CustomHomePage';
 import DefaultHomePage from './DefaultHomePage';
diff --git a/apps/meteor/client/views/home/HomePageHeader.tsx b/apps/meteor/client/views/home/HomePageHeader.tsx
index 19fe6fe9fd7..b5ae8e7de01 100644
--- a/apps/meteor/client/views/home/HomePageHeader.tsx
+++ b/apps/meteor/client/views/home/HomePageHeader.tsx
@@ -1,6 +1,7 @@
 import { Button, Icon } from '@rocket.chat/fuselage';
 import { useSetting, useTranslation, useAllPermissions } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import PageHeader from '../../components/Page/PageHeader';
 
diff --git a/apps/meteor/client/views/home/HomepageGridItem.tsx b/apps/meteor/client/views/home/HomepageGridItem.tsx
index fd9634e598c..e6178432015 100644
--- a/apps/meteor/client/views/home/HomepageGridItem.tsx
+++ b/apps/meteor/client/views/home/HomepageGridItem.tsx
@@ -1,6 +1,7 @@
 import { Grid } from '@rocket.chat/fuselage';
 import { useBreakpoints } from '@rocket.chat/fuselage-hooks';
-import React, { ReactNode, ReactElement } from 'react';
+import type { ReactNode, ReactElement } from 'react';
+import React from 'react';
 
 const HomepageGridItem = ({ children }: { children: ReactNode }): ReactElement => {
 	const breakpoints = useBreakpoints();
diff --git a/apps/meteor/client/views/home/cards/AddUsersCard.tsx b/apps/meteor/client/views/home/cards/AddUsersCard.tsx
index a5f752489f2..ceddd81c69c 100644
--- a/apps/meteor/client/views/home/cards/AddUsersCard.tsx
+++ b/apps/meteor/client/views/home/cards/AddUsersCard.tsx
@@ -1,7 +1,8 @@
 import { Button } from '@rocket.chat/fuselage';
 import { Card } from '@rocket.chat/ui-client';
 import { useTranslation, useRoute } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 const AddUsersCard = (): ReactElement => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/home/cards/CreateChannelsCard.tsx b/apps/meteor/client/views/home/cards/CreateChannelsCard.tsx
index 4242f802d9e..09ce0192a83 100644
--- a/apps/meteor/client/views/home/cards/CreateChannelsCard.tsx
+++ b/apps/meteor/client/views/home/cards/CreateChannelsCard.tsx
@@ -1,7 +1,8 @@
 import { Button } from '@rocket.chat/fuselage';
 import { Card } from '@rocket.chat/ui-client';
 import { useTranslation, useSetModal } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import CreateChannelWithData from '../../../sidebar/header/CreateChannelWithData';
 
diff --git a/apps/meteor/client/views/home/cards/DesktopAppsCard.tsx b/apps/meteor/client/views/home/cards/DesktopAppsCard.tsx
index b2842a33ba8..b83e2e0c324 100644
--- a/apps/meteor/client/views/home/cards/DesktopAppsCard.tsx
+++ b/apps/meteor/client/views/home/cards/DesktopAppsCard.tsx
@@ -1,7 +1,8 @@
 import { Button } from '@rocket.chat/fuselage';
 import { ExternalLink, Card } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 const WINDOWS_APP_URL = 'https://go.rocket.chat/i/hp-desktop-app-windows';
 const LINUX_APP_URL = 'https://go.rocket.chat/i/hp-desktop-app-linux';
diff --git a/apps/meteor/client/views/home/cards/DocumentationCard.tsx b/apps/meteor/client/views/home/cards/DocumentationCard.tsx
index 306e6af444f..7575aa3190b 100644
--- a/apps/meteor/client/views/home/cards/DocumentationCard.tsx
+++ b/apps/meteor/client/views/home/cards/DocumentationCard.tsx
@@ -1,7 +1,8 @@
 import { Button } from '@rocket.chat/fuselage';
 import { ExternalLink, Card } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 const DOCS_URL = 'https://go.rocket.chat/i/hp-documentation';
 
diff --git a/apps/meteor/client/views/home/cards/JoinRoomsCard.tsx b/apps/meteor/client/views/home/cards/JoinRoomsCard.tsx
index 9a63625c11c..01de96d8454 100644
--- a/apps/meteor/client/views/home/cards/JoinRoomsCard.tsx
+++ b/apps/meteor/client/views/home/cards/JoinRoomsCard.tsx
@@ -1,7 +1,8 @@
 import { Button } from '@rocket.chat/fuselage';
 import { Card } from '@rocket.chat/ui-client';
 import { useTranslation, useRoute } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 const JoinRoomsCard = (): ReactElement => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/home/cards/MobileAppsCard.tsx b/apps/meteor/client/views/home/cards/MobileAppsCard.tsx
index 5bad9b78909..efa7cd2de55 100644
--- a/apps/meteor/client/views/home/cards/MobileAppsCard.tsx
+++ b/apps/meteor/client/views/home/cards/MobileAppsCard.tsx
@@ -1,7 +1,8 @@
 import { Button } from '@rocket.chat/fuselage';
 import { ExternalLink, Card } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 const GOOGLE_PLAY_URL = 'https://go.rocket.chat/i/hp-mobile-app-google';
 const APP_STORE_URL = 'https://go.rocket.chat/i/hp-mobile-app-apple';
diff --git a/apps/meteor/client/views/hooks/useActionSpread.ts b/apps/meteor/client/views/hooks/useActionSpread.ts
index e742aefda53..235d971aa2b 100644
--- a/apps/meteor/client/views/hooks/useActionSpread.ts
+++ b/apps/meteor/client/views/hooks/useActionSpread.ts
@@ -1,4 +1,5 @@
-import { useMemo, ReactNode } from 'react';
+import type { ReactNode } from 'react';
+import { useMemo } from 'react';
 
 export type Action = {
 	label: ReactNode;
diff --git a/apps/meteor/client/views/hooks/useImperativeModal.ts b/apps/meteor/client/views/hooks/useImperativeModal.ts
index 54dcbbe2fcd..2cc193f2cf1 100644
--- a/apps/meteor/client/views/hooks/useImperativeModal.ts
+++ b/apps/meteor/client/views/hooks/useImperativeModal.ts
@@ -1,4 +1,5 @@
-import { createElement, useEffect, Dispatch, SetStateAction, ReactNode } from 'react';
+import type { Dispatch, SetStateAction, ReactNode } from 'react';
+import { createElement, useEffect } from 'react';
 
 import { imperativeModal } from '../../lib/imperativeModal';
 
diff --git a/apps/meteor/client/views/hooks/useUpgradeTabParams.ts b/apps/meteor/client/views/hooks/useUpgradeTabParams.ts
index f624ca5708e..58fcac536c8 100644
--- a/apps/meteor/client/views/hooks/useUpgradeTabParams.ts
+++ b/apps/meteor/client/views/hooks/useUpgradeTabParams.ts
@@ -1,7 +1,8 @@
 import { useSetting } from '@rocket.chat/ui-contexts';
 import { format } from 'date-fns';
 
-import { getUpgradeTabType, UpgradeTabVariant } from '../../../lib/upgradeTab';
+import type { UpgradeTabVariant } from '../../../lib/upgradeTab';
+import { getUpgradeTabType } from '../../../lib/upgradeTab';
 import { useLicense } from '../../hooks/useLicense';
 import { useRegistrationStatus } from '../../hooks/useRegistrationStatus';
 
diff --git a/apps/meteor/client/views/invite/InvitePage.tsx b/apps/meteor/client/views/invite/InvitePage.tsx
index 4fb8d85d793..204d960ea25 100644
--- a/apps/meteor/client/views/invite/InvitePage.tsx
+++ b/apps/meteor/client/views/invite/InvitePage.tsx
@@ -8,7 +8,8 @@ import {
 	useTranslation,
 } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { APIClient } from '../../../app/utils/client';
 import LoginPage from '../root/MainLayout/LoginPage';
diff --git a/apps/meteor/client/views/invite/SecretURLPage.tsx b/apps/meteor/client/views/invite/SecretURLPage.tsx
index c788eed05e8..c5f1836c61e 100644
--- a/apps/meteor/client/views/invite/SecretURLPage.tsx
+++ b/apps/meteor/client/views/invite/SecretURLPage.tsx
@@ -1,6 +1,7 @@
 import { useUserId, useRoute } from '@rocket.chat/ui-contexts';
 import RegistrationPageRouter from '@rocket.chat/web-ui-registration';
-import React, { ReactElement, useEffect } from 'react';
+import type { ReactElement } from 'react';
+import React, { useEffect } from 'react';
 
 const SecretURLPage = (): ReactElement | null => {
 	const uid = useUserId();
diff --git a/apps/meteor/client/views/location/MapView.tsx b/apps/meteor/client/views/location/MapView.tsx
index 0831a987553..d55ebb05b7e 100644
--- a/apps/meteor/client/views/location/MapView.tsx
+++ b/apps/meteor/client/views/location/MapView.tsx
@@ -1,5 +1,6 @@
 import { useSetting } from '@rocket.chat/ui-contexts';
-import React, { FC, memo } from 'react';
+import type { FC } from 'react';
+import React, { memo } from 'react';
 
 import MapViewFallback from './MapViewFallback';
 import MapViewImage from './MapViewImage';
diff --git a/apps/meteor/client/views/location/MapViewFallback.tsx b/apps/meteor/client/views/location/MapViewFallback.tsx
index 36cdb5936eb..2d7c88f5baa 100644
--- a/apps/meteor/client/views/location/MapViewFallback.tsx
+++ b/apps/meteor/client/views/location/MapViewFallback.tsx
@@ -1,7 +1,8 @@
 import { Box, Icon } from '@rocket.chat/fuselage';
 import { ExternalLink } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 type MapViewFallbackProps = {
 	linkUrl: string;
diff --git a/apps/meteor/client/views/location/MapViewImage.tsx b/apps/meteor/client/views/location/MapViewImage.tsx
index 84f86612cde..0fd130b5075 100644
--- a/apps/meteor/client/views/location/MapViewImage.tsx
+++ b/apps/meteor/client/views/location/MapViewImage.tsx
@@ -1,6 +1,7 @@
 import { ExternalLink } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 type MapViewImageProps = {
 	linkUrl: string;
diff --git a/apps/meteor/client/views/location/MessageLocation.tsx b/apps/meteor/client/views/location/MessageLocation.tsx
index 381239906dc..5a227cd442b 100644
--- a/apps/meteor/client/views/location/MessageLocation.tsx
+++ b/apps/meteor/client/views/location/MessageLocation.tsx
@@ -1,5 +1,6 @@
 import type { IMessage } from '@rocket.chat/core-typings';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import MapView from './MapView';
 
diff --git a/apps/meteor/client/views/mailer/MailerUnsubscriptionPage.tsx b/apps/meteor/client/views/mailer/MailerUnsubscriptionPage.tsx
index b875d14a171..65ad4cdea29 100644
--- a/apps/meteor/client/views/mailer/MailerUnsubscriptionPage.tsx
+++ b/apps/meteor/client/views/mailer/MailerUnsubscriptionPage.tsx
@@ -1,8 +1,10 @@
 import { Box, Callout, Throbber } from '@rocket.chat/fuselage';
 import { useToastMessageDispatch, useRouteParameter, useAbsoluteUrl, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, useEffect } from 'react';
+import type { FC } from 'react';
+import React, { useEffect } from 'react';
 
-import { AsyncState, AsyncStatePhase, useAsyncState } from '../../hooks/useAsyncState';
+import type { AsyncState } from '../../hooks/useAsyncState';
+import { AsyncStatePhase, useAsyncState } from '../../hooks/useAsyncState';
 
 const useMailerUnsubscriptionState = (): AsyncState<boolean> => {
 	const { resolve, reject, ...unsubscribedState } = useAsyncState<boolean>();
diff --git a/apps/meteor/client/views/meet/CallPage.tsx b/apps/meteor/client/views/meet/CallPage.tsx
index f1f006d9803..f796e843b30 100644
--- a/apps/meteor/client/views/meet/CallPage.tsx
+++ b/apps/meteor/client/views/meet/CallPage.tsx
@@ -1,7 +1,8 @@
 import { Box, Flex, ButtonGroup, Button, Icon } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
-import React, { FC, useEffect, useState } from 'react';
+import type { FC } from 'react';
+import React, { useEffect, useState } from 'react';
 
 import { Notifications } from '../../../app/notifications/client';
 import { WebRTC } from '../../../app/webrtc/client';
diff --git a/apps/meteor/client/views/meet/MeetPage.tsx b/apps/meteor/client/views/meet/MeetPage.tsx
index 8d9ea123518..f3f9e2f58d1 100644
--- a/apps/meteor/client/views/meet/MeetPage.tsx
+++ b/apps/meteor/client/views/meet/MeetPage.tsx
@@ -1,7 +1,8 @@
 import { Button, Box, Icon, Flex } from '@rocket.chat/fuselage';
 import { useRouteParameter, useQueryStringParameter } from '@rocket.chat/ui-contexts';
 import { Meteor } from 'meteor/meteor';
-import React, { useEffect, useState, useCallback, FC } from 'react';
+import type { FC } from 'react';
+import React, { useEffect, useState, useCallback } from 'react';
 
 import { APIClient } from '../../../app/utils/client';
 import UserAvatar from '../../components/avatar/UserAvatar';
diff --git a/apps/meteor/client/views/meet/OngoingCallDuration.tsx b/apps/meteor/client/views/meet/OngoingCallDuration.tsx
index 6bcf61036ba..b2807e28c16 100644
--- a/apps/meteor/client/views/meet/OngoingCallDuration.tsx
+++ b/apps/meteor/client/views/meet/OngoingCallDuration.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { FC, useEffect, useState } from 'react';
+import type { FC } from 'react';
+import React, { useEffect, useState } from 'react';
 
 type OngoingCallDurationProps = {
 	counter: number;
diff --git a/apps/meteor/client/views/modal/ModalRegion.tsx b/apps/meteor/client/views/modal/ModalRegion.tsx
index cb7da04b3cf..83ef9accefe 100644
--- a/apps/meteor/client/views/modal/ModalRegion.tsx
+++ b/apps/meteor/client/views/modal/ModalRegion.tsx
@@ -1,5 +1,6 @@
 import { useModal, useCurrentModal } from '@rocket.chat/ui-contexts';
-import React, { useCallback, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useCallback } from 'react';
 import { FocusScope } from 'react-aria';
 
 import ModalBackdrop from '../../components/modal/ModalBackdrop';
diff --git a/apps/meteor/client/views/notAuthorized/NotAuthorizedPage.stories.tsx b/apps/meteor/client/views/notAuthorized/NotAuthorizedPage.stories.tsx
index 936fde2a97a..95905847c9b 100644
--- a/apps/meteor/client/views/notAuthorized/NotAuthorizedPage.stories.tsx
+++ b/apps/meteor/client/views/notAuthorized/NotAuthorizedPage.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import NotAuthorizedPage from './NotAuthorizedPage';
diff --git a/apps/meteor/client/views/notAuthorized/NotAuthorizedPage.tsx b/apps/meteor/client/views/notAuthorized/NotAuthorizedPage.tsx
index 99b0ff3d974..b3c4978b803 100644
--- a/apps/meteor/client/views/notAuthorized/NotAuthorizedPage.tsx
+++ b/apps/meteor/client/views/notAuthorized/NotAuthorizedPage.tsx
@@ -1,6 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import Page from '../../components/Page';
 
diff --git a/apps/meteor/client/views/notFound/NotFoundPage.tsx b/apps/meteor/client/views/notFound/NotFoundPage.tsx
index d7ab9a302f3..23202479cc0 100644
--- a/apps/meteor/client/views/notFound/NotFoundPage.tsx
+++ b/apps/meteor/client/views/notFound/NotFoundPage.tsx
@@ -1,6 +1,7 @@
 import { Box, States, StatesAction, StatesActions, StatesIcon, StatesSubtitle, StatesTitle } from '@rocket.chat/fuselage';
 import { useRoute, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 const NotFoundPage = (): ReactElement => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/omnichannel/OmnichannelRouter.tsx b/apps/meteor/client/views/omnichannel/OmnichannelRouter.tsx
index d7c477b8639..1ac811d678b 100644
--- a/apps/meteor/client/views/omnichannel/OmnichannelRouter.tsx
+++ b/apps/meteor/client/views/omnichannel/OmnichannelRouter.tsx
@@ -1,5 +1,6 @@
 import { useCurrentRoute, useRoute } from '@rocket.chat/ui-contexts';
-import React, { ReactNode, Suspense, useEffect, ReactElement } from 'react';
+import type { ReactNode, ReactElement } from 'react';
+import React, { Suspense, useEffect } from 'react';
 
 import { SideNav } from '../../../app/ui-utils/client';
 import PageSkeleton from '../../components/PageSkeleton';
diff --git a/apps/meteor/client/views/omnichannel/additionalForms.tsx b/apps/meteor/client/views/omnichannel/additionalForms.tsx
index f45a8b65060..d1b7e95fab2 100644
--- a/apps/meteor/client/views/omnichannel/additionalForms.tsx
+++ b/apps/meteor/client/views/omnichannel/additionalForms.tsx
@@ -1,7 +1,8 @@
-import { ReactElement } from 'react';
+import type { ReactElement } from 'react';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
 
 /* eslint-disable @typescript-eslint/no-empty-interface */
+// eslint-disable-next-line @typescript-eslint/naming-convention
 export interface EEFormHooks {}
 
 const createFormSubscription = (): {
diff --git a/apps/meteor/client/views/omnichannel/agents/AddAgent.tsx b/apps/meteor/client/views/omnichannel/agents/AddAgent.tsx
index 707d10876bc..14a2b9ba831 100644
--- a/apps/meteor/client/views/omnichannel/agents/AddAgent.tsx
+++ b/apps/meteor/client/views/omnichannel/agents/AddAgent.tsx
@@ -1,7 +1,8 @@
 import { Button, Box, Field } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useState, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useState } from 'react';
 
 import UserAutoComplete from '../../../components/UserAutoComplete';
 import { useEndpointAction } from '../../../hooks/useEndpointAction';
diff --git a/apps/meteor/client/views/omnichannel/agents/AgentEdit.tsx b/apps/meteor/client/views/omnichannel/agents/AgentEdit.tsx
index a589a4c5815..ac88511f6e6 100644
--- a/apps/meteor/client/views/omnichannel/agents/AgentEdit.tsx
+++ b/apps/meteor/client/views/omnichannel/agents/AgentEdit.tsx
@@ -2,7 +2,8 @@ import type { ILivechatAgent, ILivechatDepartment, ILivechatDepartmentAgents } f
 import { Field, TextInput, Button, Margins, Box, MultiSelect, Icon, Select } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useToastMessageDispatch, useRoute, useSetting, useMethod, useTranslation, useEndpoint } from '@rocket.chat/ui-contexts';
-import React, { useMemo, useRef, useState, FC, ReactElement } from 'react';
+import type { FC, ReactElement } from 'react';
+import React, { useMemo, useRef, useState } from 'react';
 
 import { getUserEmailAddress } from '../../../../lib/getUserEmailAddress';
 import UserInfo from '../../../components/UserInfo';
diff --git a/apps/meteor/client/views/omnichannel/agents/AgentEditWithData.tsx b/apps/meteor/client/views/omnichannel/agents/AgentEditWithData.tsx
index b2aed4a9af4..472d2efa295 100644
--- a/apps/meteor/client/views/omnichannel/agents/AgentEditWithData.tsx
+++ b/apps/meteor/client/views/omnichannel/agents/AgentEditWithData.tsx
@@ -1,6 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { FormSkeleton } from '../../../components/Skeleton';
 import { AsyncStatePhase } from '../../../hooks/useAsyncState';
diff --git a/apps/meteor/client/views/omnichannel/agents/AgentInfo.tsx b/apps/meteor/client/views/omnichannel/agents/AgentInfo.tsx
index 85bee095b6a..5b2b15d4a9a 100644
--- a/apps/meteor/client/views/omnichannel/agents/AgentInfo.tsx
+++ b/apps/meteor/client/views/omnichannel/agents/AgentInfo.tsx
@@ -1,6 +1,7 @@
 import { Box, Margins, ButtonGroup } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { HTMLAttributes, memo } from 'react';
+import type { HTMLAttributes } from 'react';
+import React, { memo } from 'react';
 
 import { FormSkeleton } from '../../../components/Skeleton';
 import UserInfo from '../../../components/UserInfo';
diff --git a/apps/meteor/client/views/omnichannel/agents/AgentInfoAction.tsx b/apps/meteor/client/views/omnichannel/agents/AgentInfoAction.tsx
index cb8f94145ff..660cb6c3af1 100644
--- a/apps/meteor/client/views/omnichannel/agents/AgentInfoAction.tsx
+++ b/apps/meteor/client/views/omnichannel/agents/AgentInfoAction.tsx
@@ -1,5 +1,7 @@
-import { Button, Icon, IconProps } from '@rocket.chat/fuselage';
-import React, { FC, HtmlHTMLAttributes } from 'react';
+import type { IconProps } from '@rocket.chat/fuselage';
+import { Button, Icon } from '@rocket.chat/fuselage';
+import type { FC, HtmlHTMLAttributes } from 'react';
+import React from 'react';
 
 type AgentInfoActionProps = {
 	icon: IconProps['name'];
diff --git a/apps/meteor/client/views/omnichannel/agents/AgentInfoActions.tsx b/apps/meteor/client/views/omnichannel/agents/AgentInfoActions.tsx
index 030c1cfe174..66ace29da02 100644
--- a/apps/meteor/client/views/omnichannel/agents/AgentInfoActions.tsx
+++ b/apps/meteor/client/views/omnichannel/agents/AgentInfoActions.tsx
@@ -1,6 +1,7 @@
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useSetModal, useToastMessageDispatch, useRouteParameter, useRoute, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import GenericModal from '../../../components/GenericModal';
 import { useEndpointAction } from '../../../hooks/useEndpointAction';
diff --git a/apps/meteor/client/views/omnichannel/agents/AgentsPage.tsx b/apps/meteor/client/views/omnichannel/agents/AgentsPage.tsx
index ac5c35ed643..9d14e9abde5 100644
--- a/apps/meteor/client/views/omnichannel/agents/AgentsPage.tsx
+++ b/apps/meteor/client/views/omnichannel/agents/AgentsPage.tsx
@@ -1,7 +1,8 @@
 import { Box, Pagination } from '@rocket.chat/fuselage';
 import { useDebouncedValue, useMediaQuery, useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { usePermission, useRouteParameter, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useMemo, useState } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo, useState } from 'react';
 
 import FilterByText from '../../../components/FilterByText';
 import { GenericTableBody, GenericTableHeader, GenericTableHeaderCell, GenericTableLoadingTable } from '../../../components/GenericTable';
diff --git a/apps/meteor/client/views/omnichannel/agents/AgentsPageRow.tsx b/apps/meteor/client/views/omnichannel/agents/AgentsPageRow.tsx
index b67fa10033c..6fbe263727d 100644
--- a/apps/meteor/client/views/omnichannel/agents/AgentsPageRow.tsx
+++ b/apps/meteor/client/views/omnichannel/agents/AgentsPageRow.tsx
@@ -1,6 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
 import { useRoute, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useCallback } from 'react';
+import type { ReactElement } from 'react';
+import React, { useCallback } from 'react';
 
 import { GenericTableRow, GenericTableCell } from '../../../components/GenericTable';
 import UserAvatar from '../../../components/avatar/UserAvatar';
diff --git a/apps/meteor/client/views/omnichannel/agents/AgentsTab.tsx b/apps/meteor/client/views/omnichannel/agents/AgentsTab.tsx
index 7662c1f6840..01c633f60b1 100644
--- a/apps/meteor/client/views/omnichannel/agents/AgentsTab.tsx
+++ b/apps/meteor/client/views/omnichannel/agents/AgentsTab.tsx
@@ -1,5 +1,6 @@
 import { useRoute, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useCallback } from 'react';
+import type { ReactElement } from 'react';
+import React, { useCallback } from 'react';
 
 import VerticalBar from '../../../components/VerticalBar';
 import AgentEditWithData from './AgentEditWithData';
diff --git a/apps/meteor/client/views/omnichannel/agents/RemoveAgentButton.tsx b/apps/meteor/client/views/omnichannel/agents/RemoveAgentButton.tsx
index c3ea9a9278d..757e45f7b52 100644
--- a/apps/meteor/client/views/omnichannel/agents/RemoveAgentButton.tsx
+++ b/apps/meteor/client/views/omnichannel/agents/RemoveAgentButton.tsx
@@ -1,7 +1,8 @@
 import { IconButton } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useSetModal, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import GenericModal from '../../../components/GenericModal';
 import { GenericTableCell } from '../../../components/GenericTable';
diff --git a/apps/meteor/client/views/omnichannel/agents/hooks/useQuery.ts b/apps/meteor/client/views/omnichannel/agents/hooks/useQuery.ts
index fa98e888ca8..8d1f053a910 100644
--- a/apps/meteor/client/views/omnichannel/agents/hooks/useQuery.ts
+++ b/apps/meteor/client/views/omnichannel/agents/hooks/useQuery.ts
@@ -1,4 +1,4 @@
-import { PaginatedRequest } from '@rocket.chat/rest-typings';
+import type { PaginatedRequest } from '@rocket.chat/rest-typings';
 import { useMemo } from 'react';
 
 const sortDir = (sortDir: 'asc' | 'desc'): 1 | -1 => (sortDir === 'asc' ? 1 : -1);
diff --git a/apps/meteor/client/views/omnichannel/analytics/AnalyticsPage.stories.tsx b/apps/meteor/client/views/omnichannel/analytics/AnalyticsPage.stories.tsx
index 138c99389c6..524d4d50d2d 100644
--- a/apps/meteor/client/views/omnichannel/analytics/AnalyticsPage.stories.tsx
+++ b/apps/meteor/client/views/omnichannel/analytics/AnalyticsPage.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import AnalyticsPage from './AnalyticsPage';
diff --git a/apps/meteor/client/views/omnichannel/analytics/DateRangePicker.stories.tsx b/apps/meteor/client/views/omnichannel/analytics/DateRangePicker.stories.tsx
index 4394577bb57..021217d2a18 100644
--- a/apps/meteor/client/views/omnichannel/analytics/DateRangePicker.stories.tsx
+++ b/apps/meteor/client/views/omnichannel/analytics/DateRangePicker.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import DateRangePicker from './DateRangePicker';
diff --git a/apps/meteor/client/views/omnichannel/appearance/AppearanceForm.stories.tsx b/apps/meteor/client/views/omnichannel/appearance/AppearanceForm.stories.tsx
index c646dbd1534..961454a3d1b 100644
--- a/apps/meteor/client/views/omnichannel/appearance/AppearanceForm.stories.tsx
+++ b/apps/meteor/client/views/omnichannel/appearance/AppearanceForm.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import AppearanceForm from './AppearanceForm';
diff --git a/apps/meteor/client/views/omnichannel/appearance/AppearanceForm.tsx b/apps/meteor/client/views/omnichannel/appearance/AppearanceForm.tsx
index bc5bebcb467..9d5e176301a 100644
--- a/apps/meteor/client/views/omnichannel/appearance/AppearanceForm.tsx
+++ b/apps/meteor/client/views/omnichannel/appearance/AppearanceForm.tsx
@@ -1,7 +1,8 @@
 import { Box, Field, TextInput, ToggleSwitch, Accordion, FieldGroup, InputBox, TextAreaInput, NumberInput } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, FormEvent } from 'react';
+import type { FC, FormEvent } from 'react';
+import React from 'react';
 
 type AppearanceFormProps = {
 	values: {
diff --git a/apps/meteor/client/views/omnichannel/appearance/AppearancePage.tsx b/apps/meteor/client/views/omnichannel/appearance/AppearancePage.tsx
index 9c1168bf90f..7e33ed5b4ff 100644
--- a/apps/meteor/client/views/omnichannel/appearance/AppearancePage.tsx
+++ b/apps/meteor/client/views/omnichannel/appearance/AppearancePage.tsx
@@ -1,9 +1,9 @@
-import type { ISetting } from '@rocket.chat/core-typings';
-import { Serialized } from '@rocket.chat/core-typings';
+import type { ISetting, Serialized } from '@rocket.chat/core-typings';
 import { ButtonGroup, Button, Box } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useToastMessageDispatch, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import Page from '../../../components/Page';
 import { useForm } from '../../../hooks/useForm';
diff --git a/apps/meteor/client/views/omnichannel/appearance/AppearancePageContainer.tsx b/apps/meteor/client/views/omnichannel/appearance/AppearancePageContainer.tsx
index cb5d5432fd1..df15c2e9c03 100644
--- a/apps/meteor/client/views/omnichannel/appearance/AppearancePageContainer.tsx
+++ b/apps/meteor/client/views/omnichannel/appearance/AppearancePageContainer.tsx
@@ -1,6 +1,7 @@
 import { Callout } from '@rocket.chat/fuselage';
 import { usePermission, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import Page from '../../../components/Page';
 import PageSkeleton from '../../../components/PageSkeleton';
diff --git a/apps/meteor/client/views/omnichannel/businessHours/BusinessHoursForm.stories.tsx b/apps/meteor/client/views/omnichannel/businessHours/BusinessHoursForm.stories.tsx
index 2ded90c5156..bb8435c0c9b 100644
--- a/apps/meteor/client/views/omnichannel/businessHours/BusinessHoursForm.stories.tsx
+++ b/apps/meteor/client/views/omnichannel/businessHours/BusinessHoursForm.stories.tsx
@@ -1,6 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
 import { action } from '@storybook/addon-actions';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import BusinessHoursForm from './BusinessHoursForm';
diff --git a/apps/meteor/client/views/omnichannel/components/AgentInfoDetails.tsx b/apps/meteor/client/views/omnichannel/components/AgentInfoDetails.tsx
index 538577bbe2c..070fdb9288e 100644
--- a/apps/meteor/client/views/omnichannel/components/AgentInfoDetails.tsx
+++ b/apps/meteor/client/views/omnichannel/components/AgentInfoDetails.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { ReactElement, ReactNode, ComponentProps } from 'react';
+import type { ReactElement, ReactNode, ComponentProps } from 'react';
+import React from 'react';
 
 import * as UserStatus from '../../../components/UserStatus';
 
diff --git a/apps/meteor/client/views/omnichannel/components/Field.tsx b/apps/meteor/client/views/omnichannel/components/Field.tsx
index 64651ba2405..b23f312eab4 100644
--- a/apps/meteor/client/views/omnichannel/components/Field.tsx
+++ b/apps/meteor/client/views/omnichannel/components/Field.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 const Field: FC = ({ children }) => <Box mb='x16'>{children}</Box>;
 
diff --git a/apps/meteor/client/views/omnichannel/components/Info.tsx b/apps/meteor/client/views/omnichannel/components/Info.tsx
index 675a20e2557..c76978ffa43 100644
--- a/apps/meteor/client/views/omnichannel/components/Info.tsx
+++ b/apps/meteor/client/views/omnichannel/components/Info.tsx
@@ -1,5 +1,6 @@
 import { css } from '@rocket.chat/css-in-js';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import UserCard from '../../../components/UserCard';
 
diff --git a/apps/meteor/client/views/omnichannel/components/Label.tsx b/apps/meteor/client/views/omnichannel/components/Label.tsx
index 63c9f71b0e2..6e7f7e891fd 100644
--- a/apps/meteor/client/views/omnichannel/components/Label.tsx
+++ b/apps/meteor/client/views/omnichannel/components/Label.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { ComponentProps, FC } from 'react';
+import type { ComponentProps, FC } from 'react';
+import React from 'react';
 
 const Label: FC<ComponentProps<typeof Box>> = (props) => <Box mbe='x8' fontScale='p2m' color='default' {...props} />;
 
diff --git a/apps/meteor/client/views/omnichannel/contactHistory/ContactHistory.tsx b/apps/meteor/client/views/omnichannel/contactHistory/ContactHistory.tsx
index 1e17be851ec..f453e449d9d 100644
--- a/apps/meteor/client/views/omnichannel/contactHistory/ContactHistory.tsx
+++ b/apps/meteor/client/views/omnichannel/contactHistory/ContactHistory.tsx
@@ -1,4 +1,5 @@
-import React, { ReactElement, useState } from 'react';
+import type { ReactElement } from 'react';
+import React, { useState } from 'react';
 
 import ContactHistoryVerticalBar from './ContactHistoryVerticalBar';
 import ContactHistoryMessagesVerticalBar from './MessageList/ContactHistoryMessagesVerticalBar';
diff --git a/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryItem.tsx b/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryItem.tsx
index a2793b198a8..5c02764cd16 100644
--- a/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryItem.tsx
+++ b/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryItem.tsx
@@ -7,9 +7,10 @@ import {
 	MessageGenericPreviewTitle,
 	MessageSystemBody,
 } from '@rocket.chat/fuselage';
-import { VisitorSearchChatsResult } from '@rocket.chat/rest-typings';
+import type { VisitorSearchChatsResult } from '@rocket.chat/rest-typings';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { Dispatch, memo, ReactElement, SetStateAction } from 'react';
+import type { Dispatch, ReactElement, SetStateAction } from 'react';
+import React, { memo } from 'react';
 
 import UserAvatar from '../../../components/avatar/UserAvatar';
 import { useFormatDateAndTime } from '../../../hooks/useFormatDateAndTime';
diff --git a/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryVerticalBar.tsx b/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryVerticalBar.tsx
index cbc66e96abe..351a8560296 100644
--- a/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryVerticalBar.tsx
+++ b/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryVerticalBar.tsx
@@ -1,6 +1,7 @@
 import { Box, Margins, TextInput, Icon, Throbber, States, StatesIcon, StatesTitle, StatesSubtitle } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ChangeEvent, Dispatch, ReactElement, SetStateAction, useMemo, useState } from 'react';
+import type { ChangeEvent, Dispatch, ReactElement, SetStateAction } from 'react';
+import React, { useMemo, useState } from 'react';
 import { Virtuoso } from 'react-virtuoso';
 
 import ScrollableContentWrapper from '../../../components/ScrollableContentWrapper';
diff --git a/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessage.tsx b/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessage.tsx
index 4e72d414445..6bddd505e8f 100644
--- a/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessage.tsx
+++ b/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessage.tsx
@@ -19,7 +19,8 @@ import {
 	MessageSystemTimestamp,
 } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, memo } from 'react';
+import type { FC } from 'react';
+import React, { memo } from 'react';
 
 import UserAvatar from '../../../../components/avatar/UserAvatar';
 import { useFormatDate } from '../../../../hooks/useFormatDate';
diff --git a/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessagesVerticalBar.tsx b/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessagesVerticalBar.tsx
index 39989bcb2d1..a34c1231436 100644
--- a/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessagesVerticalBar.tsx
+++ b/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessagesVerticalBar.tsx
@@ -1,6 +1,7 @@
 import { Box, Icon, Margins, States, StatesIcon, StatesSubtitle, StatesTitle, TextInput, Throbber } from '@rocket.chat/fuselage';
 import { useSetting, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ChangeEvent, Dispatch, ReactElement, SetStateAction, useMemo, useState } from 'react';
+import type { ChangeEvent, Dispatch, ReactElement, SetStateAction } from 'react';
+import React, { useMemo, useState } from 'react';
 import { Virtuoso } from 'react-virtuoso';
 
 import ScrollableContentWrapper from '../../../../components/ScrollableContentWrapper';
diff --git a/apps/meteor/client/views/omnichannel/contactHistory/useHistoryList.ts b/apps/meteor/client/views/omnichannel/contactHistory/useHistoryList.ts
index 29302d9bc66..a3b5085a268 100644
--- a/apps/meteor/client/views/omnichannel/contactHistory/useHistoryList.ts
+++ b/apps/meteor/client/views/omnichannel/contactHistory/useHistoryList.ts
@@ -1,4 +1,4 @@
-import { VisitorSearchChatsResult } from '@rocket.chat/rest-typings';
+import type { VisitorSearchChatsResult } from '@rocket.chat/rest-typings';
 import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useCallback, useState } from 'react';
 
diff --git a/apps/meteor/client/views/omnichannel/currentChats/CurrentChatsRoute.tsx b/apps/meteor/client/views/omnichannel/currentChats/CurrentChatsRoute.tsx
index f2230bdd677..01640818b2b 100644
--- a/apps/meteor/client/views/omnichannel/currentChats/CurrentChatsRoute.tsx
+++ b/apps/meteor/client/views/omnichannel/currentChats/CurrentChatsRoute.tsx
@@ -3,7 +3,8 @@ import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import type { GETLivechatRoomsParams } from '@rocket.chat/rest-typings';
 import { usePermission, useRoute, useRouteParameter, useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
-import React, { ComponentProps, memo, ReactElement, useCallback, useMemo, useState } from 'react';
+import type { ComponentProps, ReactElement } from 'react';
+import React, { memo, useCallback, useMemo, useState } from 'react';
 
 import {
 	GenericTableBody,
diff --git a/apps/meteor/client/views/omnichannel/currentChats/CustomFieldsVerticalBar.tsx b/apps/meteor/client/views/omnichannel/currentChats/CustomFieldsVerticalBar.tsx
index e40f0f6554b..749be5a800d 100644
--- a/apps/meteor/client/views/omnichannel/currentChats/CustomFieldsVerticalBar.tsx
+++ b/apps/meteor/client/views/omnichannel/currentChats/CustomFieldsVerticalBar.tsx
@@ -1,7 +1,8 @@
-import { ILivechatCustomField } from '@rocket.chat/core-typings';
+import type { ILivechatCustomField } from '@rocket.chat/core-typings';
 import { Field, TextInput, Select } from '@rocket.chat/fuselage';
 import { useTranslation, useRoute } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, Dispatch, SetStateAction, useEffect } from 'react';
+import type { ReactElement, Dispatch, SetStateAction } from 'react';
+import React, { useEffect } from 'react';
 import { Controller, useForm } from 'react-hook-form';
 
 import VerticalBar from '../../../components/VerticalBar';
diff --git a/apps/meteor/client/views/omnichannel/currentChats/FilterByText.tsx b/apps/meteor/client/views/omnichannel/currentChats/FilterByText.tsx
index 11a5df1f42d..b9dda465295 100644
--- a/apps/meteor/client/views/omnichannel/currentChats/FilterByText.tsx
+++ b/apps/meteor/client/views/omnichannel/currentChats/FilterByText.tsx
@@ -2,7 +2,8 @@ import { TextInput, Box, Select, InputBox } from '@rocket.chat/fuselage';
 import { useMutableCallback, useLocalStorage } from '@rocket.chat/fuselage-hooks';
 import { useSetModal, useToastMessageDispatch, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
-import React, { Dispatch, FC, SetStateAction, useEffect } from 'react';
+import type { Dispatch, FC, SetStateAction } from 'react';
+import React, { useEffect } from 'react';
 
 import AutoCompleteAgent from '../../../components/AutoCompleteAgent';
 import AutoCompleteDepartment from '../../../components/AutoCompleteDepartment';
diff --git a/apps/meteor/client/views/omnichannel/currentChats/Label.tsx b/apps/meteor/client/views/omnichannel/currentChats/Label.tsx
index 125d4af0e5c..a8f61ecd76a 100644
--- a/apps/meteor/client/views/omnichannel/currentChats/Label.tsx
+++ b/apps/meteor/client/views/omnichannel/currentChats/Label.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { ComponentProps, FC } from 'react';
+import type { ComponentProps, FC } from 'react';
+import React from 'react';
 
 const Label: FC<ComponentProps<typeof Box>> = (props) => <Box fontScale='p2m' color='default' {...props} />;
 
diff --git a/apps/meteor/client/views/omnichannel/currentChats/RemoveAllClosed.tsx b/apps/meteor/client/views/omnichannel/currentChats/RemoveAllClosed.tsx
index 5f8bc42068a..19f17686c99 100644
--- a/apps/meteor/client/views/omnichannel/currentChats/RemoveAllClosed.tsx
+++ b/apps/meteor/client/views/omnichannel/currentChats/RemoveAllClosed.tsx
@@ -1,6 +1,7 @@
 import { Box, Icon, Menu } from '@rocket.chat/fuselage';
 import { usePermission, useTranslation, useRoute } from '@rocket.chat/ui-contexts';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 const RemoveAllClosed: FC<{
 	handleClearFilters: any;
diff --git a/apps/meteor/client/views/omnichannel/currentChats/RemoveChatButton.tsx b/apps/meteor/client/views/omnichannel/currentChats/RemoveChatButton.tsx
index adfc49b096f..915ec35e634 100644
--- a/apps/meteor/client/views/omnichannel/currentChats/RemoveChatButton.tsx
+++ b/apps/meteor/client/views/omnichannel/currentChats/RemoveChatButton.tsx
@@ -1,7 +1,8 @@
 import { IconButton } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useSetModal, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import GenericModal from '../../../components/GenericModal';
 import { GenericTableCell } from '../../../components/GenericTable';
diff --git a/apps/meteor/client/views/omnichannel/currentChats/hooks/useAllCustomFields.tsx b/apps/meteor/client/views/omnichannel/currentChats/hooks/useAllCustomFields.tsx
index e13f90fa177..d6987786eba 100644
--- a/apps/meteor/client/views/omnichannel/currentChats/hooks/useAllCustomFields.tsx
+++ b/apps/meteor/client/views/omnichannel/currentChats/hooks/useAllCustomFields.tsx
@@ -1,6 +1,7 @@
-import { OperationResult } from '@rocket.chat/rest-typings';
+import type { OperationResult } from '@rocket.chat/rest-typings';
 import { useEndpoint } from '@rocket.chat/ui-contexts';
-import { useQuery, UseQueryResult } from '@tanstack/react-query';
+import type { UseQueryResult } from '@tanstack/react-query';
+import { useQuery } from '@tanstack/react-query';
 
 export const useAllCustomFields = (): UseQueryResult<OperationResult<'GET', '/v1/livechat/custom-fields'>> => {
 	const allCustomFields = useEndpoint('GET', '/v1/livechat/custom-fields');
diff --git a/apps/meteor/client/views/omnichannel/currentChats/hooks/useCurrentChats.ts b/apps/meteor/client/views/omnichannel/currentChats/hooks/useCurrentChats.ts
index 15e6606b41d..d1c41a2b093 100644
--- a/apps/meteor/client/views/omnichannel/currentChats/hooks/useCurrentChats.ts
+++ b/apps/meteor/client/views/omnichannel/currentChats/hooks/useCurrentChats.ts
@@ -1,7 +1,8 @@
 import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
 import type { GETLivechatRoomsParams, OperationResult } from '@rocket.chat/rest-typings';
 import { useEndpoint } from '@rocket.chat/ui-contexts';
-import { useQuery, UseQueryResult } from '@tanstack/react-query';
+import type { UseQueryResult } from '@tanstack/react-query';
+import { useQuery } from '@tanstack/react-query';
 
 export const useCurrentChats = (query: GETLivechatRoomsParams): UseQueryResult<OperationResult<'GET', '/v1/livechat/rooms'>> => {
 	const currentChats = useEndpoint('GET', '/v1/livechat/rooms');
diff --git a/apps/meteor/client/views/omnichannel/currentChats/hooks/useRemoveCurrentChatMutation.ts b/apps/meteor/client/views/omnichannel/currentChats/hooks/useRemoveCurrentChatMutation.ts
index 2e12c2b7426..97a8dccbf93 100644
--- a/apps/meteor/client/views/omnichannel/currentChats/hooks/useRemoveCurrentChatMutation.ts
+++ b/apps/meteor/client/views/omnichannel/currentChats/hooks/useRemoveCurrentChatMutation.ts
@@ -1,6 +1,7 @@
-import { IRoom } from '@rocket.chat/core-typings';
+import type { IRoom } from '@rocket.chat/core-typings';
 import { useMethod } from '@rocket.chat/ui-contexts';
-import { useQueryClient, useMutation, UseMutationOptions, UseMutationResult } from '@tanstack/react-query';
+import type { UseMutationOptions, UseMutationResult } from '@tanstack/react-query';
+import { useQueryClient, useMutation } from '@tanstack/react-query';
 
 export const useRemoveCurrentChatMutation = (
 	options?: Omit<UseMutationOptions<void, Error, IRoom['_id']>, 'mutationFn'>,
diff --git a/apps/meteor/client/views/omnichannel/customFields/CustomFieldsForm.stories.tsx b/apps/meteor/client/views/omnichannel/customFields/CustomFieldsForm.stories.tsx
index f68893b582f..f8c6320e661 100644
--- a/apps/meteor/client/views/omnichannel/customFields/CustomFieldsForm.stories.tsx
+++ b/apps/meteor/client/views/omnichannel/customFields/CustomFieldsForm.stories.tsx
@@ -1,6 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
 import { action } from '@storybook/addon-actions';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import CustomFieldsForm from './CustomFieldsForm';
diff --git a/apps/meteor/client/views/omnichannel/directory/CallDialpadButton.tsx b/apps/meteor/client/views/omnichannel/directory/CallDialpadButton.tsx
index 78bdda45d79..8637b258d22 100644
--- a/apps/meteor/client/views/omnichannel/directory/CallDialpadButton.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/CallDialpadButton.tsx
@@ -1,7 +1,8 @@
 import { css } from '@rocket.chat/css-in-js';
 import { IconButton } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { MouseEvent, ReactElement } from 'react';
+import type { MouseEvent, ReactElement } from 'react';
+import React from 'react';
 
 import { useVoipOutboundStates } from '../../../contexts/CallContext';
 import { useDialModal } from '../../../hooks/useDialModal';
diff --git a/apps/meteor/client/views/omnichannel/directory/CallsContextualBarDirectory.tsx b/apps/meteor/client/views/omnichannel/directory/CallsContextualBarDirectory.tsx
index e74e5ecfad3..085f3f02260 100644
--- a/apps/meteor/client/views/omnichannel/directory/CallsContextualBarDirectory.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/CallsContextualBarDirectory.tsx
@@ -1,7 +1,8 @@
 import type { IVoipRoom } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
 import { useRoute, useRouteParameter, useQueryStringParameter, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, useMemo } from 'react';
+import type { FC } from 'react';
+import React, { useMemo } from 'react';
 
 import VerticalBar from '../../../components/VerticalBar';
 import { AsyncStatePhase } from '../../../hooks/useAsyncState';
diff --git a/apps/meteor/client/views/omnichannel/directory/ChatsContextualBar.tsx b/apps/meteor/client/views/omnichannel/directory/ChatsContextualBar.tsx
index f13d2b17b29..ac6f7f9bdbd 100644
--- a/apps/meteor/client/views/omnichannel/directory/ChatsContextualBar.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/ChatsContextualBar.tsx
@@ -1,6 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
 import { useRoute, useRouteParameter, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, useMemo } from 'react';
+import type { FC } from 'react';
+import React, { useMemo } from 'react';
 
 import VerticalBar from '../../../components/VerticalBar';
 import { AsyncStatePhase } from '../../../hooks/useAsyncState';
diff --git a/apps/meteor/client/views/omnichannel/directory/ContextualBar.tsx b/apps/meteor/client/views/omnichannel/directory/ContextualBar.tsx
index 19bd2195229..7f10eb45651 100644
--- a/apps/meteor/client/views/omnichannel/directory/ContextualBar.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/ContextualBar.tsx
@@ -1,5 +1,6 @@
 import { useRouteParameter } from '@rocket.chat/ui-contexts';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import CallsContextualBarDirectory from './CallsContextualBarDirectory';
 import ChatsContextualBar from './ChatsContextualBar';
diff --git a/apps/meteor/client/views/omnichannel/directory/OmnichannelDirectoryPage.tsx b/apps/meteor/client/views/omnichannel/directory/OmnichannelDirectoryPage.tsx
index e33f8df3e04..1840377c7db 100644
--- a/apps/meteor/client/views/omnichannel/directory/OmnichannelDirectoryPage.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/OmnichannelDirectoryPage.tsx
@@ -1,6 +1,7 @@
 import { Tabs } from '@rocket.chat/fuselage';
 import { useCurrentRoute, useRoute, useRouteParameter, usePermission, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useEffect, useCallback, useState, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useEffect, useCallback, useState } from 'react';
 
 import Page from '../../../components/Page';
 import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
diff --git a/apps/meteor/client/views/omnichannel/directory/calls/Call.tsx b/apps/meteor/client/views/omnichannel/directory/calls/Call.tsx
index 50c2efcebfa..7ca723a50ec 100644
--- a/apps/meteor/client/views/omnichannel/directory/calls/Call.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/calls/Call.tsx
@@ -1,6 +1,7 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
-import React, { useEffect, ReactElement, Suspense } from 'react';
+import type { ReactElement } from 'react';
+import React, { useEffect, Suspense } from 'react';
 
 import { openRoom } from '../../../../../app/ui-utils/client/lib/openRoom';
 import { Room, RoomProvider, RoomSkeleton } from '../../../room';
diff --git a/apps/meteor/client/views/omnichannel/directory/calls/CallTab.tsx b/apps/meteor/client/views/omnichannel/directory/calls/CallTab.tsx
index 5d926c9577c..3014753c552 100644
--- a/apps/meteor/client/views/omnichannel/directory/calls/CallTab.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/calls/CallTab.tsx
@@ -1,5 +1,6 @@
 import { usePermission } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import NotAuthorizedPage from '../../../notAuthorized/NotAuthorizedPage';
 import CallTable from './CallTable';
diff --git a/apps/meteor/client/views/omnichannel/directory/calls/CallTable.tsx b/apps/meteor/client/views/omnichannel/directory/calls/CallTable.tsx
index 26e49fec2fe..f79107a65aa 100644
--- a/apps/meteor/client/views/omnichannel/directory/calls/CallTable.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/calls/CallTable.tsx
@@ -1,7 +1,8 @@
 import { useDebouncedValue, useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useRoute, useTranslation } from '@rocket.chat/ui-contexts';
 import { Meteor } from 'meteor/meteor';
-import React, { useState, useMemo, useCallback, FC } from 'react';
+import type { FC } from 'react';
+import React, { useState, useMemo, useCallback } from 'react';
 
 import GenericTable from '../../../../components/GenericTable';
 import { useEndpointData } from '../../../../hooks/useEndpointData';
diff --git a/apps/meteor/client/views/omnichannel/directory/calls/CallTableRow.tsx b/apps/meteor/client/views/omnichannel/directory/calls/CallTableRow.tsx
index 851d3a7ec6c..f3b6d08ccfa 100644
--- a/apps/meteor/client/views/omnichannel/directory/calls/CallTableRow.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/calls/CallTableRow.tsx
@@ -1,8 +1,9 @@
-import { IVoipRoom } from '@rocket.chat/core-typings';
+import type { IVoipRoom } from '@rocket.chat/core-typings';
 import { Table } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
-import React, { ReactElement, useCallback } from 'react';
+import type { ReactElement } from 'react';
+import React, { useCallback } from 'react';
 
 import { parseOutboundPhoneNumber } from '../../../../../ee/client/lib/voip/parseOutboundPhoneNumber';
 import { useIsCallReady } from '../../../../contexts/CallContext';
diff --git a/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/CallsContextualBarRoom.tsx b/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/CallsContextualBarRoom.tsx
index a3801d909bc..8da33f5424c 100644
--- a/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/CallsContextualBarRoom.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/CallsContextualBarRoom.tsx
@@ -1,4 +1,5 @@
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { useVoipRoom } from '../../../../room/contexts/RoomContext';
 import { VoipInfo } from './VoipInfo';
diff --git a/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/InfoField.tsx b/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/InfoField.tsx
index adb769df92f..c14e64c6c74 100644
--- a/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/InfoField.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/InfoField.tsx
@@ -1,4 +1,5 @@
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import InfoPanel from '../../../../../components/InfoPanel';
 
diff --git a/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfo.tsx b/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfo.tsx
index 100277afae7..6746b2a6f99 100644
--- a/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfo.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfo.tsx
@@ -2,7 +2,8 @@ import type { IVoipRoom } from '@rocket.chat/core-typings';
 import { Box, Icon, Chip, ButtonGroup } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
-import React, { ReactElement, useMemo } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo } from 'react';
 
 import { parseOutboundPhoneNumber } from '../../../../../../ee/client/lib/voip/parseOutboundPhoneNumber';
 import InfoPanel from '../../../../../components/InfoPanel';
diff --git a/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfoCallButton.tsx b/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfoCallButton.tsx
index c3f12648580..264f965ac96 100644
--- a/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfoCallButton.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfoCallButton.tsx
@@ -1,6 +1,7 @@
 import { Button, Icon } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { useVoipOutboundStates } from '../../../../../contexts/CallContext';
 import { useDialModal } from '../../../../../hooks/useDialModal';
diff --git a/apps/meteor/client/views/omnichannel/directory/chats/Chat.tsx b/apps/meteor/client/views/omnichannel/directory/chats/Chat.tsx
index 72e82ec93d1..1f9711ea81e 100644
--- a/apps/meteor/client/views/omnichannel/directory/chats/Chat.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/chats/Chat.tsx
@@ -1,6 +1,7 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
-import React, { useEffect, Suspense, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useEffect, Suspense } from 'react';
 
 import { openRoom } from '../../../../../app/ui-utils/client/lib/openRoom';
 import { Room, RoomProvider, RoomSkeleton } from '../../../room';
diff --git a/apps/meteor/client/views/omnichannel/directory/chats/ChatTab.tsx b/apps/meteor/client/views/omnichannel/directory/chats/ChatTab.tsx
index 1971ef888b4..a86e4c91ec9 100644
--- a/apps/meteor/client/views/omnichannel/directory/chats/ChatTab.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/chats/ChatTab.tsx
@@ -1,5 +1,6 @@
 import { usePermission } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, SetStateAction, Dispatch } from 'react';
+import type { ReactElement, SetStateAction, Dispatch } from 'react';
+import React from 'react';
 
 import NotAuthorizedPage from '../../../notAuthorized/NotAuthorizedPage';
 import ChatTable from './ChatTable';
diff --git a/apps/meteor/client/views/omnichannel/directory/chats/ChatTable.tsx b/apps/meteor/client/views/omnichannel/directory/chats/ChatTable.tsx
index 3ad3b547b80..c02be35b7cd 100644
--- a/apps/meteor/client/views/omnichannel/directory/chats/ChatTable.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/chats/ChatTable.tsx
@@ -3,7 +3,8 @@ import { useDebouncedValue, useMutableCallback } from '@rocket.chat/fuselage-hoo
 import { useRoute, useTranslation } from '@rocket.chat/ui-contexts';
 import { Meteor } from 'meteor/meteor';
 import moment from 'moment';
-import React, { useState, useMemo, useCallback, useEffect, FC, ReactElement, Dispatch, SetStateAction } from 'react';
+import type { FC, ReactElement, Dispatch, SetStateAction } from 'react';
+import React, { useState, useMemo, useCallback, useEffect } from 'react';
 
 import FilterByText from '../../../../components/FilterByText';
 import GenericTable from '../../../../components/GenericTable';
diff --git a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/SourceField.tsx b/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/SourceField.tsx
index b67b7c9677d..140a3f07d9a 100644
--- a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/SourceField.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/SourceField.tsx
@@ -1,7 +1,8 @@
 import type { IOmnichannelRoom } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import { OmnichannelRoomIcon } from '../../../../../components/RoomIcon/OmnichannelRoomIcon';
 import Field from '../../../components/Field';
diff --git a/apps/meteor/client/views/omnichannel/directory/contacts/ContactTable.tsx b/apps/meteor/client/views/omnichannel/directory/contacts/ContactTable.tsx
index fb983dd79a1..7e9aea9fd7a 100644
--- a/apps/meteor/client/views/omnichannel/directory/contacts/ContactTable.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/contacts/ContactTable.tsx
@@ -1,7 +1,8 @@
 import { Icon, Pagination, States, StatesAction, StatesActions, StatesIcon, StatesTitle, Box } from '@rocket.chat/fuselage';
 import { useDebouncedState, useDebouncedValue, useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useRoute, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useMemo, useEffect, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo, useEffect } from 'react';
 
 import { parseOutboundPhoneNumber } from '../../../../../ee/client/lib/voip/parseOutboundPhoneNumber';
 import FilterByText from '../../../../components/FilterByText';
diff --git a/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactNewEdit.tsx b/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactNewEdit.tsx
index 27cb9daeba0..27afea71fe4 100644
--- a/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactNewEdit.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactNewEdit.tsx
@@ -1,8 +1,9 @@
-import { ILivechatCustomField, ILivechatVisitor, Serialized } from '@rocket.chat/core-typings';
+import type { ILivechatCustomField, ILivechatVisitor, Serialized } from '@rocket.chat/core-typings';
 import { Field, TextInput, ButtonGroup, Button } from '@rocket.chat/fuselage';
 import { useToastMessageDispatch, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
-import React, { useState, useEffect, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useState, useEffect } from 'react';
 import { useController, useForm } from 'react-hook-form';
 import { debounce } from 'underscore';
 
diff --git a/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactsContextualBar.tsx b/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactsContextualBar.tsx
index 98a592913e3..02cf97861ca 100644
--- a/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactsContextualBar.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactsContextualBar.tsx
@@ -1,6 +1,7 @@
 import type { IOmnichannelRoom } from '@rocket.chat/core-typings';
 import { useRoute, useRouteParameter, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import VerticalBar from '../../../../../components/VerticalBar';
 import { useOmnichannelRoom } from '../../../../room/contexts/RoomContext';
diff --git a/apps/meteor/client/views/omnichannel/facebook/FacebookPage.tsx b/apps/meteor/client/views/omnichannel/facebook/FacebookPage.tsx
index 9836d11db3d..04d00a90dc8 100644
--- a/apps/meteor/client/views/omnichannel/facebook/FacebookPage.tsx
+++ b/apps/meteor/client/views/omnichannel/facebook/FacebookPage.tsx
@@ -1,6 +1,7 @@
 import { Box, Button, ButtonGroup, FieldGroup, Divider } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, Dispatch } from 'react';
+import type { FC, Dispatch } from 'react';
+import React from 'react';
 
 import Page from '../../../components/Page';
 import PageToggleAssembler from './PageToggleAssembler';
diff --git a/apps/meteor/client/views/omnichannel/facebook/FacebookPageContainer.tsx b/apps/meteor/client/views/omnichannel/facebook/FacebookPageContainer.tsx
index 667bd61d058..16241f40f0b 100644
--- a/apps/meteor/client/views/omnichannel/facebook/FacebookPageContainer.tsx
+++ b/apps/meteor/client/views/omnichannel/facebook/FacebookPageContainer.tsx
@@ -2,7 +2,8 @@ import { Callout } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useToastMessageDispatch, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import Page from '../../../components/Page';
 import PageSkeleton from '../../../components/PageSkeleton';
diff --git a/apps/meteor/client/views/omnichannel/facebook/PageToggle.tsx b/apps/meteor/client/views/omnichannel/facebook/PageToggle.tsx
index 5570ae0d99e..e924cb5f60e 100644
--- a/apps/meteor/client/views/omnichannel/facebook/PageToggle.tsx
+++ b/apps/meteor/client/views/omnichannel/facebook/PageToggle.tsx
@@ -1,6 +1,7 @@
 import { Box, Field, ToggleSwitch } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import React, { FC, useState, Dispatch, ComponentProps } from 'react';
+import type { FC, Dispatch, ComponentProps } from 'react';
+import React, { useState } from 'react';
 
 type OnToggleProps = {
 	onToggle: (id: string, isSubscribed: boolean, setSubscribed: Dispatch<boolean>) => void;
diff --git a/apps/meteor/client/views/omnichannel/facebook/PageToggleAssembler.tsx b/apps/meteor/client/views/omnichannel/facebook/PageToggleAssembler.tsx
index ba92c217987..f79ba6950ba 100644
--- a/apps/meteor/client/views/omnichannel/facebook/PageToggleAssembler.tsx
+++ b/apps/meteor/client/views/omnichannel/facebook/PageToggleAssembler.tsx
@@ -1,5 +1,6 @@
 import { FieldGroup } from '@rocket.chat/fuselage';
-import React, { FC, Dispatch, ComponentProps } from 'react';
+import type { FC, Dispatch, ComponentProps } from 'react';
+import React from 'react';
 
 import PageToggle from './PageToggle';
 
diff --git a/apps/meteor/client/views/omnichannel/installation/Installation.stories.tsx b/apps/meteor/client/views/omnichannel/installation/Installation.stories.tsx
index d735f265b37..cad83b5f9a9 100644
--- a/apps/meteor/client/views/omnichannel/installation/Installation.stories.tsx
+++ b/apps/meteor/client/views/omnichannel/installation/Installation.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import Installation from './Installation';
diff --git a/apps/meteor/client/views/omnichannel/installation/Installation.tsx b/apps/meteor/client/views/omnichannel/installation/Installation.tsx
index 54998c7e575..784b2e78421 100644
--- a/apps/meteor/client/views/omnichannel/installation/Installation.tsx
+++ b/apps/meteor/client/views/omnichannel/installation/Installation.tsx
@@ -1,6 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
 import { useSetting, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import Page from '../../../components/Page';
 import RawText from '../../../components/RawText';
diff --git a/apps/meteor/client/views/omnichannel/installation/Wrapper.tsx b/apps/meteor/client/views/omnichannel/installation/Wrapper.tsx
index 21cb371dfbb..c002fd06fe5 100644
--- a/apps/meteor/client/views/omnichannel/installation/Wrapper.tsx
+++ b/apps/meteor/client/views/omnichannel/installation/Wrapper.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 const Wrapper = (text: string): ReactElement => (
 	<Box fontFamily='mono' alignSelf='center' fontScale='p2' style={{ wordBreak: 'break-all' }} mie='x4' flexGrow={1} withRichContent>
diff --git a/apps/meteor/client/views/omnichannel/managers/AddManager.tsx b/apps/meteor/client/views/omnichannel/managers/AddManager.tsx
index c904b02d529..d06942fcbb8 100644
--- a/apps/meteor/client/views/omnichannel/managers/AddManager.tsx
+++ b/apps/meteor/client/views/omnichannel/managers/AddManager.tsx
@@ -1,7 +1,8 @@
 import { Button, Box, Field } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useState, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useState } from 'react';
 
 import UserAutoComplete from '../../../components/UserAutoComplete';
 import { useEndpointAction } from '../../../hooks/useEndpointAction';
diff --git a/apps/meteor/client/views/omnichannel/managers/ManagersRoute.tsx b/apps/meteor/client/views/omnichannel/managers/ManagersRoute.tsx
index 75f8fad9d15..4d68db0f33a 100644
--- a/apps/meteor/client/views/omnichannel/managers/ManagersRoute.tsx
+++ b/apps/meteor/client/views/omnichannel/managers/ManagersRoute.tsx
@@ -1,7 +1,8 @@
 import { Box, Pagination } from '@rocket.chat/fuselage';
 import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
 import { usePermission, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useMemo } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo } from 'react';
 
 import {
 	GenericTable,
diff --git a/apps/meteor/client/views/omnichannel/managers/RemoveManagerButton.tsx b/apps/meteor/client/views/omnichannel/managers/RemoveManagerButton.tsx
index 4233ca0e3f3..3e420ab5601 100644
--- a/apps/meteor/client/views/omnichannel/managers/RemoveManagerButton.tsx
+++ b/apps/meteor/client/views/omnichannel/managers/RemoveManagerButton.tsx
@@ -1,7 +1,8 @@
 import { Table, IconButton } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useSetModal, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import GenericModal from '../../../components/GenericModal';
 import { useEndpointAction } from '../../../hooks/useEndpointAction';
diff --git a/apps/meteor/client/views/omnichannel/queueList/QueueListFilter.tsx b/apps/meteor/client/views/omnichannel/queueList/QueueListFilter.tsx
index a47663dc1a8..4ff32c3fe4c 100644
--- a/apps/meteor/client/views/omnichannel/queueList/QueueListFilter.tsx
+++ b/apps/meteor/client/views/omnichannel/queueList/QueueListFilter.tsx
@@ -1,7 +1,8 @@
 import { Box, Select, Label } from '@rocket.chat/fuselage';
 import { useMutableCallback, useLocalStorage } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { Dispatch, FC, SetStateAction, useEffect } from 'react';
+import type { Dispatch, FC, SetStateAction } from 'react';
+import React, { useEffect } from 'react';
 
 import AutoCompleteAgent from '../../../components/AutoCompleteAgent';
 import AutoCompleteDepartment from '../../../components/AutoCompleteDepartment';
diff --git a/apps/meteor/client/views/omnichannel/queueList/QueueListPage.tsx b/apps/meteor/client/views/omnichannel/queueList/QueueListPage.tsx
index 96bbde86a57..53e5bdfb812 100644
--- a/apps/meteor/client/views/omnichannel/queueList/QueueListPage.tsx
+++ b/apps/meteor/client/views/omnichannel/queueList/QueueListPage.tsx
@@ -1,4 +1,5 @@
-import React, { Dispatch, Key, ReactElement, ReactNode, SetStateAction } from 'react';
+import type { Dispatch, Key, ReactElement, ReactNode, SetStateAction } from 'react';
+import React from 'react';
 
 import GenericTable from '../../../components/GenericTable';
 import Page from '../../../components/Page';
diff --git a/apps/meteor/client/views/omnichannel/queueList/index.tsx b/apps/meteor/client/views/omnichannel/queueList/index.tsx
index e8a1bd711f2..541f3d1b676 100644
--- a/apps/meteor/client/views/omnichannel/queueList/index.tsx
+++ b/apps/meteor/client/views/omnichannel/queueList/index.tsx
@@ -1,7 +1,8 @@
 import { Box, Table } from '@rocket.chat/fuselage';
 import { useDebouncedValue, useMediaQuery, useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useCallback, useMemo, useState } from 'react';
+import type { ReactElement } from 'react';
+import React, { useCallback, useMemo, useState } from 'react';
 
 import GenericTable from '../../../components/GenericTable';
 import UserAvatar from '../../../components/avatar/UserAvatar';
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.stories.tsx b/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.stories.tsx
index c658354c2a4..d3a43adf701 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.stories.tsx
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import CounterContainer from './CounterContainer';
diff --git a/apps/meteor/client/views/omnichannel/sidebar/OmnichannelSidebar.tsx b/apps/meteor/client/views/omnichannel/sidebar/OmnichannelSidebar.tsx
index c7def16dd3b..b8a6fa74392 100644
--- a/apps/meteor/client/views/omnichannel/sidebar/OmnichannelSidebar.tsx
+++ b/apps/meteor/client/views/omnichannel/sidebar/OmnichannelSidebar.tsx
@@ -1,5 +1,6 @@
 import { useRoutePath, useCurrentRoute, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useCallback, useEffect, FC, memo } from 'react';
+import type { FC } from 'react';
+import React, { useCallback, useEffect, memo } from 'react';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
 
 import { menu, SideNav } from '../../../../app/ui-utils/client';
diff --git a/apps/meteor/client/views/omnichannel/triggers/TriggersForm.stories.tsx b/apps/meteor/client/views/omnichannel/triggers/TriggersForm.stories.tsx
index 664df61a1a6..37595518279 100644
--- a/apps/meteor/client/views/omnichannel/triggers/TriggersForm.stories.tsx
+++ b/apps/meteor/client/views/omnichannel/triggers/TriggersForm.stories.tsx
@@ -1,6 +1,6 @@
 import { FieldGroup, Box } from '@rocket.chat/fuselage';
 import { action } from '@storybook/addon-actions';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import TriggersForm from './TriggersForm';
diff --git a/apps/meteor/client/views/omnichannel/triggers/TriggersForm.tsx b/apps/meteor/client/views/omnichannel/triggers/TriggersForm.tsx
index 6167427d472..75f22872ff6 100644
--- a/apps/meteor/client/views/omnichannel/triggers/TriggersForm.tsx
+++ b/apps/meteor/client/views/omnichannel/triggers/TriggersForm.tsx
@@ -1,7 +1,9 @@
-import { Box, Field, TextInput, ToggleSwitch, Select, TextAreaInput, SelectOption } from '@rocket.chat/fuselage';
+import type { SelectOption } from '@rocket.chat/fuselage';
+import { Box, Field, TextInput, ToggleSwitch, Select, TextAreaInput } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ComponentProps, FC, FormEvent, useMemo, useState } from 'react';
+import type { ComponentProps, FC, FormEvent } from 'react';
+import React, { useMemo, useState } from 'react';
 
 import { useComponentDidUpdate } from '../../../hooks/useComponentDidUpdate';
 
diff --git a/apps/meteor/client/views/room/Announcement/Announcement.stories.tsx b/apps/meteor/client/views/room/Announcement/Announcement.stories.tsx
index 7e339d4d663..bf5e01eaee1 100644
--- a/apps/meteor/client/views/room/Announcement/Announcement.stories.tsx
+++ b/apps/meteor/client/views/room/Announcement/Announcement.stories.tsx
@@ -1,5 +1,5 @@
 import { action } from '@storybook/addon-actions';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import Announcement from '.';
diff --git a/apps/meteor/client/views/room/Announcement/Announcement.tsx b/apps/meteor/client/views/room/Announcement/Announcement.tsx
index 2691ea9b7a7..8134e4aa2d4 100644
--- a/apps/meteor/client/views/room/Announcement/Announcement.tsx
+++ b/apps/meteor/client/views/room/Announcement/Announcement.tsx
@@ -1,7 +1,8 @@
 import { Box } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useSetModal, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, MouseEvent } from 'react';
+import type { FC, MouseEvent } from 'react';
+import React from 'react';
 
 import GenericModal from '../../../components/GenericModal';
 import MarkdownText from '../../../components/MarkdownText';
diff --git a/apps/meteor/client/views/room/Announcement/AnnouncementComponent.tsx b/apps/meteor/client/views/room/Announcement/AnnouncementComponent.tsx
index f307128d00f..5cfcfe5e4db 100644
--- a/apps/meteor/client/views/room/Announcement/AnnouncementComponent.tsx
+++ b/apps/meteor/client/views/room/Announcement/AnnouncementComponent.tsx
@@ -1,7 +1,8 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Palette } from '@rocket.chat/fuselage';
 import colors from '@rocket.chat/fuselage-tokens/colors';
-import React, { FC, MouseEvent } from 'react';
+import type { FC, MouseEvent } from 'react';
+import React from 'react';
 
 type AnnouncementComponentParams = {
 	onClickOpen: (e: MouseEvent<HTMLAnchorElement>) => void;
diff --git a/apps/meteor/client/views/room/Header/DirectRoomHeader.tsx b/apps/meteor/client/views/room/Header/DirectRoomHeader.tsx
index c7c8f600cda..524eb8d2e52 100644
--- a/apps/meteor/client/views/room/Header/DirectRoomHeader.tsx
+++ b/apps/meteor/client/views/room/Header/DirectRoomHeader.tsx
@@ -1,6 +1,7 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { useUserId } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { usePresence } from '../../../hooks/usePresence';
 import RoomHeader from './RoomHeader';
diff --git a/apps/meteor/client/views/room/Header/Header.tsx b/apps/meteor/client/views/room/Header/Header.tsx
index cc05c5dd38f..2af53f13046 100644
--- a/apps/meteor/client/views/room/Header/Header.tsx
+++ b/apps/meteor/client/views/room/Header/Header.tsx
@@ -2,7 +2,8 @@ import type { IRoom } from '@rocket.chat/core-typings';
 import { isVoipRoom } from '@rocket.chat/core-typings';
 import { Header as TemplateHeader } from '@rocket.chat/ui-client';
 import { useLayout } from '@rocket.chat/ui-contexts';
-import React, { memo, ReactElement, useMemo } from 'react';
+import type { ReactElement } from 'react';
+import React, { memo, useMemo } from 'react';
 
 import BurgerMenu from '../../../components/BurgerMenu';
 import DirectRoomHeader from './DirectRoomHeader';
diff --git a/apps/meteor/client/views/room/Header/HeaderIconWithRoom.tsx b/apps/meteor/client/views/room/Header/HeaderIconWithRoom.tsx
index fdea83b7c15..2665dd5a56d 100644
--- a/apps/meteor/client/views/room/Header/HeaderIconWithRoom.tsx
+++ b/apps/meteor/client/views/room/Header/HeaderIconWithRoom.tsx
@@ -1,6 +1,8 @@
-import { IRoom, isOmnichannelRoom } from '@rocket.chat/core-typings';
+import type { IRoom } from '@rocket.chat/core-typings';
+import { isOmnichannelRoom } from '@rocket.chat/core-typings';
 import { Header } from '@rocket.chat/ui-client';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { OmnichannelRoomIcon } from '../../../components/RoomIcon/OmnichannelRoomIcon';
 import { useRoomIcon } from '../../../hooks/useRoomIcon';
diff --git a/apps/meteor/client/views/room/Header/Omnichannel/BackButton.tsx b/apps/meteor/client/views/room/Header/Omnichannel/BackButton.tsx
index 68c6760df41..26c87d209de 100644
--- a/apps/meteor/client/views/room/Header/Omnichannel/BackButton.tsx
+++ b/apps/meteor/client/views/room/Header/Omnichannel/BackButton.tsx
@@ -1,7 +1,8 @@
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { Header } from '@rocket.chat/ui-client';
 import { useCurrentRoute, useRoute, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 export const BackButton = ({ routeName }: { routeName?: string }): ReactElement => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/room/Header/Omnichannel/OmnichannelRoomHeader.tsx b/apps/meteor/client/views/room/Header/Omnichannel/OmnichannelRoomHeader.tsx
index 4a444617ce4..bae7ac0c39a 100644
--- a/apps/meteor/client/views/room/Header/Omnichannel/OmnichannelRoomHeader.tsx
+++ b/apps/meteor/client/views/room/Header/Omnichannel/OmnichannelRoomHeader.tsx
@@ -1,11 +1,12 @@
 import { Header as TemplateHeader } from '@rocket.chat/ui-client';
 import { useLayout, useCurrentRoute } from '@rocket.chat/ui-contexts';
-import React, { FC, useMemo } from 'react';
+import type { FC } from 'react';
+import React, { useMemo } from 'react';
 
 import BurgerMenu from '../../../../components/BurgerMenu';
 import { useOmnichannelRoom } from '../../contexts/RoomContext';
 import { ToolboxContext, useToolboxContext } from '../../contexts/ToolboxContext';
-import { ToolboxActionConfig } from '../../lib/Toolbox';
+import type { ToolboxActionConfig } from '../../lib/Toolbox';
 import RoomHeader from '../RoomHeader';
 import { BackButton } from './BackButton';
 import QuickActions from './QuickActions';
diff --git a/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/QuickActions.tsx b/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/QuickActions.tsx
index dd1c3e75613..9c2aa80b927 100644
--- a/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/QuickActions.tsx
+++ b/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/QuickActions.tsx
@@ -1,8 +1,9 @@
 import type { IOmnichannelRoom } from '@rocket.chat/core-typings';
-import { Box } from '@rocket.chat/fuselage';
+import type { Box } from '@rocket.chat/fuselage';
 import { Header } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { memo, FC, ComponentProps } from 'react';
+import type { FC, ComponentProps } from 'react';
+import React, { memo } from 'react';
 
 import { useQuickActions } from './hooks/useQuickActions';
 
diff --git a/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/hooks/usePutChatOnHoldMutation.ts b/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/hooks/usePutChatOnHoldMutation.ts
index d31fb4d9aa6..0c9dbc76795 100644
--- a/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/hooks/usePutChatOnHoldMutation.ts
+++ b/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/hooks/usePutChatOnHoldMutation.ts
@@ -1,6 +1,7 @@
-import { IRoom } from '@rocket.chat/core-typings';
+import type { IRoom } from '@rocket.chat/core-typings';
 import { useEndpoint } from '@rocket.chat/ui-contexts';
-import { useMutation, UseMutationOptions, UseMutationResult, useQueryClient } from '@tanstack/react-query';
+import type { UseMutationOptions, UseMutationResult } from '@tanstack/react-query';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
 
 export const usePutChatOnHoldMutation = (
 	options?: Omit<UseMutationOptions<void, Error, IRoom['_id']>, 'mutationFn'>,
diff --git a/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/hooks/useQuickActions.tsx b/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/hooks/useQuickActions.tsx
index a095249edd2..a176c4b06cf 100644
--- a/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/hooks/useQuickActions.tsx
+++ b/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/hooks/useQuickActions.tsx
@@ -22,7 +22,8 @@ import ForwardChatModal from '../../../../../../components/Omnichannel/modals/Fo
 import ReturnChatQueueModal from '../../../../../../components/Omnichannel/modals/ReturnChatQueueModal';
 import TranscriptModal from '../../../../../../components/Omnichannel/modals/TranscriptModal';
 import { useOmnichannelRouteConfig } from '../../../../../../hooks/omnichannel/useOmnichannelRouteConfig';
-import { QuickActionsActionConfig, QuickActionsEnum } from '../../../../lib/QuickActions';
+import type { QuickActionsActionConfig } from '../../../../lib/QuickActions';
+import { QuickActionsEnum } from '../../../../lib/QuickActions';
 import { useQuickActionsContext } from '../../../../lib/QuickActions/QuickActionsContext';
 import { usePutChatOnHoldMutation } from './usePutChatOnHoldMutation';
 import { useReturnChatToQueueMutation } from './useReturnChatToQueueMutation';
diff --git a/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/hooks/useReturnChatToQueueMutation.ts b/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/hooks/useReturnChatToQueueMutation.ts
index 022fe5ecb02..71714b63b0d 100644
--- a/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/hooks/useReturnChatToQueueMutation.ts
+++ b/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/hooks/useReturnChatToQueueMutation.ts
@@ -1,6 +1,7 @@
-import { IRoom } from '@rocket.chat/core-typings';
+import type { IRoom } from '@rocket.chat/core-typings';
 import { useMethod } from '@rocket.chat/ui-contexts';
-import { useMutation, UseMutationOptions, UseMutationResult, useQueryClient } from '@tanstack/react-query';
+import type { UseMutationOptions, UseMutationResult } from '@tanstack/react-query';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
 
 export const useReturnChatToQueueMutation = (
 	options?: Omit<UseMutationOptions<void, Error, IRoom['_id']>, 'mutationFn'>,
diff --git a/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/index.ts b/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/index.ts
index 870b19e5293..128c5683366 100644
--- a/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/index.ts
+++ b/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/index.ts
@@ -1,2 +1 @@
 export { default } from './QuickActions';
-export * from './QuickActions';
diff --git a/apps/meteor/client/views/room/Header/Omnichannel/VoipRoomHeader.tsx b/apps/meteor/client/views/room/Header/Omnichannel/VoipRoomHeader.tsx
index 50811462902..d4252b2116f 100644
--- a/apps/meteor/client/views/room/Header/Omnichannel/VoipRoomHeader.tsx
+++ b/apps/meteor/client/views/room/Header/Omnichannel/VoipRoomHeader.tsx
@@ -1,13 +1,15 @@
-import { IVoipRoom } from '@rocket.chat/core-typings';
+import type { IVoipRoom } from '@rocket.chat/core-typings';
 import { Header as TemplateHeader } from '@rocket.chat/ui-client';
 import { useLayout, useCurrentRoute } from '@rocket.chat/ui-contexts';
-import React, { FC, useMemo } from 'react';
+import type { FC } from 'react';
+import React, { useMemo } from 'react';
 
 import { parseOutboundPhoneNumber } from '../../../../../ee/client/lib/voip/parseOutboundPhoneNumber';
 import BurgerMenu from '../../../../components/BurgerMenu';
 import { ToolboxContext, useToolboxContext } from '../../contexts/ToolboxContext';
-import { ToolboxActionConfig } from '../../lib/Toolbox';
-import RoomHeader, { RoomHeaderProps } from '../RoomHeader';
+import type { ToolboxActionConfig } from '../../lib/Toolbox';
+import type { RoomHeaderProps } from '../RoomHeader';
+import RoomHeader from '../RoomHeader';
 import { BackButton } from './BackButton';
 
 export type VoipRoomHeaderProps = {
diff --git a/apps/meteor/client/views/room/Header/ParentRoom.tsx b/apps/meteor/client/views/room/Header/ParentRoom.tsx
index 5f434d91685..ca9f9d0390a 100644
--- a/apps/meteor/client/views/room/Header/ParentRoom.tsx
+++ b/apps/meteor/client/views/room/Header/ParentRoom.tsx
@@ -1,6 +1,7 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { Header } from '@rocket.chat/ui-client';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { useRoomIcon } from '../../../hooks/useRoomIcon';
 import { roomCoordinator } from '../../../lib/rooms/roomCoordinator';
diff --git a/apps/meteor/client/views/room/Header/ParentRoomWithData.tsx b/apps/meteor/client/views/room/Header/ParentRoomWithData.tsx
index f3860cdff2c..0e11c33aed4 100644
--- a/apps/meteor/client/views/room/Header/ParentRoomWithData.tsx
+++ b/apps/meteor/client/views/room/Header/ParentRoomWithData.tsx
@@ -1,6 +1,7 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { useUserSubscription } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import ParentRoom from './ParentRoom';
 import ParentRoomWithEndpointData from './ParentRoomWithEndpointData';
diff --git a/apps/meteor/client/views/room/Header/ParentRoomWithEndpointData.tsx b/apps/meteor/client/views/room/Header/ParentRoomWithEndpointData.tsx
index 565b6bc9902..468ffa08f7c 100644
--- a/apps/meteor/client/views/room/Header/ParentRoomWithEndpointData.tsx
+++ b/apps/meteor/client/views/room/Header/ParentRoomWithEndpointData.tsx
@@ -1,6 +1,7 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { Header } from '@rocket.chat/ui-client';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { useRoomInfoEndpoint } from '../../../hooks/useRoomInfoEndpoint';
 import ParentRoom from './ParentRoom';
diff --git a/apps/meteor/client/views/room/Header/ParentTeam.tsx b/apps/meteor/client/views/room/Header/ParentTeam.tsx
index b6f1314557d..88b6f8918e1 100644
--- a/apps/meteor/client/views/room/Header/ParentTeam.tsx
+++ b/apps/meteor/client/views/room/Header/ParentTeam.tsx
@@ -2,7 +2,8 @@ import type { IRoom } from '@rocket.chat/core-typings';
 import { TEAM_TYPE } from '@rocket.chat/core-typings';
 import { Header } from '@rocket.chat/ui-client';
 import { useUserId } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useMemo } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo } from 'react';
 
 import { AsyncStatePhase } from '../../../hooks/useAsyncState';
 import { useEndpointData } from '../../../hooks/useEndpointData';
diff --git a/apps/meteor/client/views/room/Header/RoomHeader.tsx b/apps/meteor/client/views/room/Header/RoomHeader.tsx
index 91b332c43ff..131d811fd07 100644
--- a/apps/meteor/client/views/room/Header/RoomHeader.tsx
+++ b/apps/meteor/client/views/room/Header/RoomHeader.tsx
@@ -1,7 +1,8 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { Header } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import MarkdownText from '../../../components/MarkdownText';
 import RoomAvatar from '../../../components/avatar/RoomAvatar';
diff --git a/apps/meteor/client/views/room/Header/RoomTitle.tsx b/apps/meteor/client/views/room/Header/RoomTitle.tsx
index 20dac05dcd1..c057f503fb6 100644
--- a/apps/meteor/client/views/room/Header/RoomTitle.tsx
+++ b/apps/meteor/client/views/room/Header/RoomTitle.tsx
@@ -1,6 +1,7 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { Header } from '@rocket.chat/ui-client';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import HeaderIconWithRoom from './HeaderIconWithRoom';
 
diff --git a/apps/meteor/client/views/room/Header/ToolBox/ToolBox.tsx b/apps/meteor/client/views/room/Header/ToolBox/ToolBox.tsx
index 9256e55cf19..1beb5293088 100644
--- a/apps/meteor/client/views/room/Header/ToolBox/ToolBox.tsx
+++ b/apps/meteor/client/views/room/Header/ToolBox/ToolBox.tsx
@@ -1,13 +1,16 @@
 import type { IRoom } from '@rocket.chat/core-typings';
-import { Menu, Option, Box } from '@rocket.chat/fuselage';
+import type { Box } from '@rocket.chat/fuselage';
+import { Menu, Option } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { Header } from '@rocket.chat/ui-client';
-import { TranslationKey, useLayout, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { memo, ReactNode, useRef, ComponentProps, ReactElement } from 'react';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useLayout, useTranslation } from '@rocket.chat/ui-contexts';
+import type { ReactNode, ComponentProps, ReactElement } from 'react';
+import React, { memo, useRef } from 'react';
 
 // used to open the menu option by keyboard
 import { useToolboxContext, useTab, useTabBarOpen } from '../../contexts/ToolboxContext';
-import { ToolboxActionConfig, OptionRenderer } from '../../lib/Toolbox';
+import type { ToolboxActionConfig, OptionRenderer } from '../../lib/Toolbox';
 
 const renderMenuOption: OptionRenderer = ({ label: { title, icon }, ...props }: any): ReactNode => (
 	<Option label={title} icon={icon} data-qa-id={`ToolBoxAction-${icon}`} {...props} />
diff --git a/apps/meteor/client/views/room/Header/ToolBox/index.ts b/apps/meteor/client/views/room/Header/ToolBox/index.ts
index e6735313347..85606d55fee 100644
--- a/apps/meteor/client/views/room/Header/ToolBox/index.ts
+++ b/apps/meteor/client/views/room/Header/ToolBox/index.ts
@@ -1,2 +1 @@
 export { default } from './ToolBox';
-export * from './ToolBox';
diff --git a/apps/meteor/client/views/room/Header/icons/Translate.tsx b/apps/meteor/client/views/room/Header/icons/Translate.tsx
index 1f00ac0efcc..9e87b2b39af 100644
--- a/apps/meteor/client/views/room/Header/icons/Translate.tsx
+++ b/apps/meteor/client/views/room/Header/icons/Translate.tsx
@@ -2,7 +2,8 @@ import type { IRoom } from '@rocket.chat/core-typings';
 import colors from '@rocket.chat/fuselage-tokens/colors';
 import { Header } from '@rocket.chat/ui-client';
 import { useSetting, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, memo } from 'react';
+import type { FC } from 'react';
+import React, { memo } from 'react';
 
 type TranslateProps = {
 	room: IRoom;
diff --git a/apps/meteor/client/views/room/MessageList/MessageList.tsx b/apps/meteor/client/views/room/MessageList/MessageList.tsx
index 5594196a3ff..1b20983905e 100644
--- a/apps/meteor/client/views/room/MessageList/MessageList.tsx
+++ b/apps/meteor/client/views/room/MessageList/MessageList.tsx
@@ -1,7 +1,9 @@
-import { isThreadMessage, IThreadMessage, IRoom } from '@rocket.chat/core-typings';
+import type { IThreadMessage, IRoom } from '@rocket.chat/core-typings';
+import { isThreadMessage } from '@rocket.chat/core-typings';
 import { MessageDivider } from '@rocket.chat/fuselage';
 import { useUserSubscription, useSetting, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { Fragment, memo, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { Fragment, memo } from 'react';
 
 import { MessageTypes } from '../../../../app/ui-utils/client';
 import { useFormatDate } from '../../../hooks/useFormatDate';
diff --git a/apps/meteor/client/views/room/MessageList/MessageListErrorBoundary.tsx b/apps/meteor/client/views/room/MessageList/MessageListErrorBoundary.tsx
index 4803e54777c..dbd1f0fa57c 100644
--- a/apps/meteor/client/views/room/MessageList/MessageListErrorBoundary.tsx
+++ b/apps/meteor/client/views/room/MessageList/MessageListErrorBoundary.tsx
@@ -1,6 +1,7 @@
 import { States, StatesIcon, StatesTitle, StatesSubtitle, StatesActions, StatesAction, Icon } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, ReactNode } from 'react';
+import type { ReactElement, ReactNode } from 'react';
+import React from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
 
 import { useRoom } from '../contexts/RoomContext';
diff --git a/apps/meteor/client/views/room/MessageList/components/Message.tsx b/apps/meteor/client/views/room/MessageList/components/Message.tsx
index 5bb3003e270..154b59ca9fd 100644
--- a/apps/meteor/client/views/room/MessageList/components/Message.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/Message.tsx
@@ -2,13 +2,14 @@
 import type { IMessage } from '@rocket.chat/core-typings';
 import { Message as MessageTemplate, MessageLeftContainer, MessageContainer, MessageBody, CheckBox } from '@rocket.chat/fuselage';
 import { useToggle } from '@rocket.chat/fuselage-hooks';
-import React, { FC, memo } from 'react';
+import type { FC } from 'react';
+import React, { memo } from 'react';
 
 import UserAvatar from '../../../../components/avatar/UserAvatar';
 import { useMessageActions } from '../../contexts/MessageContext';
 import { useIsMessageHighlight } from '../contexts/MessageHighlightContext';
 import { useIsSelecting, useToggleSelect, useIsSelectedMessage, useCountSelected } from '../contexts/SelectedMessagesContext';
-import { MessageWithMdEnforced } from '../lib/parseMessageTextToAstMarkdown';
+import type { MessageWithMdEnforced } from '../lib/parseMessageTextToAstMarkdown';
 import MessageContent from './MessageContent';
 import MessageContentIgnored from './MessageContentIgnored';
 import MessageHeader from './MessageHeader';
diff --git a/apps/meteor/client/views/room/MessageList/components/MessageContent.tsx b/apps/meteor/client/views/room/MessageList/components/MessageContent.tsx
index 161ba24e812..dd26baa1770 100644
--- a/apps/meteor/client/views/room/MessageList/components/MessageContent.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/MessageContent.tsx
@@ -1,8 +1,11 @@
 /* eslint-disable complexity */
-import { IMessage, isDiscussionMessage, isThreadMainMessage, ISubscription, isE2EEMessage } from '@rocket.chat/core-typings';
+import type { IMessage, ISubscription } from '@rocket.chat/core-typings';
+import { isDiscussionMessage, isThreadMainMessage, isE2EEMessage } from '@rocket.chat/core-typings';
 import { MessageBlock } from '@rocket.chat/fuselage';
-import { useTranslation, useUserId, TranslationKey } from '@rocket.chat/ui-contexts';
-import React, { FC, memo } from 'react';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation, useUserId } from '@rocket.chat/ui-contexts';
+import type { FC } from 'react';
+import React, { memo } from 'react';
 
 import Attachments from '../../../../components/message/Attachments';
 import MessageActions from '../../../../components/message/MessageActions';
@@ -10,13 +13,13 @@ import BroadcastMetric from '../../../../components/message/Metrics/Broadcast';
 import DiscussionMetric from '../../../../components/message/Metrics/Discussion';
 import ThreadMetric from '../../../../components/message/Metrics/Thread';
 import { useUserData } from '../../../../hooks/useUserData';
-import { UserPresence } from '../../../../lib/presence';
+import type { UserPresence } from '../../../../lib/presence';
 import MessageBlockUiKit from '../../../blocks/MessageBlock';
 import MessageLocation from '../../../location/MessageLocation';
 import { useMessageActions, useMessageOembedIsEnabled, useMessageRunActionLink } from '../../contexts/MessageContext';
 import { useTranslateAttachments, useMessageListShowReadReceipt } from '../contexts/MessageListContext';
 import { isOwnUserMessage } from '../lib/isOwnUserMessage';
-import { MessageWithMdEnforced } from '../lib/parseMessageTextToAstMarkdown';
+import type { MessageWithMdEnforced } from '../lib/parseMessageTextToAstMarkdown';
 import MessageContentBody from './MessageContentBody';
 import ReactionsList from './MessageReactionsList';
 import ReadReceipt from './MessageReadReceipt';
diff --git a/apps/meteor/client/views/room/MessageList/components/MessageContentBody.tsx b/apps/meteor/client/views/room/MessageList/components/MessageContentBody.tsx
index 0999bb2d11c..067577dd86b 100644
--- a/apps/meteor/client/views/room/MessageList/components/MessageContentBody.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/MessageContentBody.tsx
@@ -1,16 +1,18 @@
 import { css } from '@rocket.chat/css-in-js';
 import { MessageBody, Box, Palette } from '@rocket.chat/fuselage';
-import { MarkupInteractionContext, Markup, UserMention, ChannelMention } from '@rocket.chat/gazzodown';
+import type { UserMention, ChannelMention } from '@rocket.chat/gazzodown';
+import { MarkupInteractionContext, Markup } from '@rocket.chat/gazzodown';
 import { escapeRegExp } from '@rocket.chat/string-helpers';
 import { useLayout, useUserPreference } from '@rocket.chat/ui-contexts';
 import { FlowRouter } from 'meteor/kadira:flow-router';
-import React, { ReactElement, UIEvent, useCallback, useMemo } from 'react';
+import type { ReactElement, UIEvent } from 'react';
+import React, { useCallback, useMemo } from 'react';
 
 import { emoji } from '../../../../../app/emoji/client';
 import { fireGlobalEvent } from '../../../../lib/utils/fireGlobalEvent';
 import { useMessageActions } from '../../contexts/MessageContext';
 import { useMessageListHighlights } from '../contexts/MessageListContext';
-import { MessageWithMdEnforced } from '../lib/parseMessageTextToAstMarkdown';
+import type { MessageWithMdEnforced } from '../lib/parseMessageTextToAstMarkdown';
 
 type MessageContentBodyProps = Pick<MessageWithMdEnforced, 'mentions' | 'channels' | 'md'>;
 
diff --git a/apps/meteor/client/views/room/MessageList/components/MessageContentIgnored.tsx b/apps/meteor/client/views/room/MessageList/components/MessageContentIgnored.tsx
index 1363af35ec5..be3d84eed83 100644
--- a/apps/meteor/client/views/room/MessageList/components/MessageContentIgnored.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/MessageContentIgnored.tsx
@@ -1,7 +1,8 @@
 /* eslint-disable complexity */
 import { Box, Icon } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, memo } from 'react';
+import type { FC } from 'react';
+import React, { memo } from 'react';
 
 const MessageContentIgnored: FC<{ onShowMessageIgnored: () => void }> = ({ onShowMessageIgnored }) => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/room/MessageList/components/MessageHeader.tsx b/apps/meteor/client/views/room/MessageList/components/MessageHeader.tsx
index 485be9a045f..78a72d71f4b 100644
--- a/apps/meteor/client/views/room/MessageList/components/MessageHeader.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/MessageHeader.tsx
@@ -1,4 +1,4 @@
-import { IMessage } from '@rocket.chat/core-typings';
+import type { IMessage } from '@rocket.chat/core-typings';
 import {
 	MessageHeader as MessageHeaderTemplate,
 	MessageName,
@@ -8,11 +8,12 @@ import {
 	MessageNameContainer,
 } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, memo } from 'react';
+import type { FC } from 'react';
+import React, { memo } from 'react';
 
 import { useUserData } from '../../../../hooks/useUserData';
 import { getUserDisplayName } from '../../../../lib/getUserDisplayName';
-import { UserPresence } from '../../../../lib/presence';
+import type { UserPresence } from '../../../../lib/presence';
 import { useMessageActions } from '../../contexts/MessageContext';
 import { useMessageListShowUsername, useMessageListShowRealName, useMessageListShowRoles } from '../contexts/MessageListContext';
 import { useMessageRoles } from '../hooks/useMessageRoles';
diff --git a/apps/meteor/client/views/room/MessageList/components/MessageIndicators.tsx b/apps/meteor/client/views/room/MessageList/components/MessageIndicators.tsx
index 04731123466..3a0702c81ba 100644
--- a/apps/meteor/client/views/room/MessageList/components/MessageIndicators.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/MessageIndicators.tsx
@@ -1,7 +1,9 @@
-import { IMessage, isEditedMessage, ITranslatedMessage, isE2EEMessage, isOTRMessage } from '@rocket.chat/core-typings';
+import type { IMessage, ITranslatedMessage } from '@rocket.chat/core-typings';
+import { isEditedMessage, isE2EEMessage, isOTRMessage } from '@rocket.chat/core-typings';
 import { MessageStatusIndicator, MessageStatusIndicatorItem, MessageStatusIndicatorText } from '@rocket.chat/fuselage';
 import { useUserId, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import {
 	useMessageDateFormatter,
diff --git a/apps/meteor/client/views/room/MessageList/components/MessageReaction.tsx b/apps/meteor/client/views/room/MessageList/components/MessageReaction.tsx
index 64b918b360f..4f3aa1f962e 100644
--- a/apps/meteor/client/views/room/MessageList/components/MessageReaction.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/MessageReaction.tsx
@@ -1,6 +1,8 @@
 import { MessageReaction as MessageReactionTemplate, MessageReactionEmoji, MessageReactionCounter } from '@rocket.chat/fuselage';
-import { useTooltipClose, useTooltipOpen, useTranslation, TranslationKey } from '@rocket.chat/ui-contexts';
-import React, { FC, useRef } from 'react';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTooltipClose, useTooltipOpen, useTranslation } from '@rocket.chat/ui-contexts';
+import type { FC } from 'react';
+import React, { useRef } from 'react';
 
 import MarkdownText from '../../../../components/MarkdownText';
 import { getEmojiClassNameAndDataTitle } from '../../../../lib/utils/renderEmoji';
diff --git a/apps/meteor/client/views/room/MessageList/components/MessageReactionsList.tsx b/apps/meteor/client/views/room/MessageList/components/MessageReactionsList.tsx
index d599cd9615f..2b6317bf614 100644
--- a/apps/meteor/client/views/room/MessageList/components/MessageReactionsList.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/MessageReactionsList.tsx
@@ -1,6 +1,7 @@
-import { IMessage } from '@rocket.chat/core-typings';
+import type { IMessage } from '@rocket.chat/core-typings';
 import { MessageReactions, MessageReactionAction } from '@rocket.chat/fuselage';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { useOpenEmojiPicker, useReactionsFilter, useReactToMessage, useUserHasReacted } from '../contexts/MessageListContext';
 import { MessageReaction } from './MessageReaction';
diff --git a/apps/meteor/client/views/room/MessageList/components/MessageReadReceipt.tsx b/apps/meteor/client/views/room/MessageList/components/MessageReadReceipt.tsx
index a6e004a299e..80c010eb5d7 100644
--- a/apps/meteor/client/views/room/MessageList/components/MessageReadReceipt.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/MessageReadReceipt.tsx
@@ -1,6 +1,7 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Icon } from '@rocket.chat/fuselage';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 const MessageReadReceipt = ({ unread }: { unread?: boolean }): ReactElement | null => (
 	<Box
diff --git a/apps/meteor/client/views/room/MessageList/components/MessageRolesList.tsx b/apps/meteor/client/views/room/MessageList/components/MessageRolesList.tsx
index ee93931c6ce..efa0f305700 100644
--- a/apps/meteor/client/views/room/MessageList/components/MessageRolesList.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/MessageRolesList.tsx
@@ -1,6 +1,7 @@
 import { MessageRole, MessageRoles } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 type MessageRolesListProps = {
 	roles: Array<string>;
diff --git a/apps/meteor/client/views/room/MessageList/components/MessageSystem.tsx b/apps/meteor/client/views/room/MessageList/components/MessageSystem.tsx
index 8394527756d..fb91b30691c 100644
--- a/apps/meteor/client/views/room/MessageList/components/MessageSystem.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/MessageSystem.tsx
@@ -1,4 +1,4 @@
-import { IMessage } from '@rocket.chat/core-typings';
+import type { IMessage } from '@rocket.chat/core-typings';
 import {
 	MessageSystem as MessageSystemTemplate,
 	MessageSystemBody,
@@ -11,8 +11,10 @@ import {
 	MessageUsername,
 	MessageNameContainer,
 } from '@rocket.chat/fuselage';
-import { TranslationKey, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, memo } from 'react';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
+import type { FC } from 'react';
+import React, { memo } from 'react';
 
 import { MessageTypes } from '../../../../../app/ui-utils/client';
 import UserAvatar from '../../../../components/avatar/UserAvatar';
@@ -20,7 +22,7 @@ import Attachments from '../../../../components/message/Attachments';
 import MessageActions from '../../../../components/message/MessageActions';
 import { useUserData } from '../../../../hooks/useUserData';
 import { getUserDisplayName } from '../../../../lib/getUserDisplayName';
-import { UserPresence } from '../../../../lib/presence';
+import type { UserPresence } from '../../../../lib/presence';
 import { useMessageActions, useMessageRunActionLink } from '../../contexts/MessageContext';
 import { useMessageListShowRealName, useMessageListShowUsername } from '../contexts/MessageListContext';
 import { useIsSelecting, useToggleSelect, useIsSelectedMessage, useCountSelected } from '../contexts/SelectedMessagesContext';
diff --git a/apps/meteor/client/views/room/MessageList/components/ThreadMessagePreview.tsx b/apps/meteor/client/views/room/MessageList/components/ThreadMessagePreview.tsx
index c5e1574281f..fb74cd29034 100644
--- a/apps/meteor/client/views/room/MessageList/components/ThreadMessagePreview.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/ThreadMessagePreview.tsx
@@ -1,4 +1,4 @@
-import { IThreadMessage } from '@rocket.chat/core-typings';
+import type { IThreadMessage } from '@rocket.chat/core-typings';
 import {
 	Skeleton,
 	ThreadMessage as ThreadMessageTemplate,
@@ -12,7 +12,8 @@ import {
 	CheckBox,
 } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import { MessageTypes } from '../../../../../app/ui-utils/client';
 import UserAvatar from '../../../../components/avatar/UserAvatar';
diff --git a/apps/meteor/client/views/room/MessageList/components/ThreadMessagePreviewBody.tsx b/apps/meteor/client/views/room/MessageList/components/ThreadMessagePreviewBody.tsx
index 80cbe550b07..01301417e18 100644
--- a/apps/meteor/client/views/room/MessageList/components/ThreadMessagePreviewBody.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/ThreadMessagePreviewBody.tsx
@@ -1,6 +1,7 @@
-import { IMessage } from '@rocket.chat/core-typings';
+import type { IMessage } from '@rocket.chat/core-typings';
 import { PreviewMarkup } from '@rocket.chat/gazzodown';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { parseMessageTextToAstMarkdown } from '../lib/parseMessageTextToAstMarkdown';
 
diff --git a/apps/meteor/client/views/room/MessageList/components/Toolbox/MessageActionMenu.tsx b/apps/meteor/client/views/room/MessageList/components/Toolbox/MessageActionMenu.tsx
index d5f30bc7fb3..fd103cda3f5 100644
--- a/apps/meteor/client/views/room/MessageList/components/Toolbox/MessageActionMenu.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/Toolbox/MessageActionMenu.tsx
@@ -1,8 +1,9 @@
 import { MessageToolboxItem, Option } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, useState, Fragment, useRef, ComponentProps, UIEvent } from 'react';
+import type { FC, ComponentProps, UIEvent } from 'react';
+import React, { useState, Fragment, useRef } from 'react';
 
-import { MessageActionConfig } from '../../../../../../app/ui-utils/client/lib/MessageAction';
+import type { MessageActionConfig } from '../../../../../../app/ui-utils/client/lib/MessageAction';
 import { ToolboxDropdown } from './ToolboxDropdown';
 
 type MessageActionConfigOption = Omit<MessageActionConfig, 'condition' | 'context' | 'order' | 'action'> & {
diff --git a/apps/meteor/client/views/room/MessageList/components/Toolbox/Toolbox.tsx b/apps/meteor/client/views/room/MessageList/components/Toolbox/Toolbox.tsx
index 1b2a3935dca..06591e9d877 100644
--- a/apps/meteor/client/views/room/MessageList/components/Toolbox/Toolbox.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/Toolbox/Toolbox.tsx
@@ -1,9 +1,12 @@
-import { IMessage, isRoomFederated, IUser, IRoom } from '@rocket.chat/core-typings';
+import type { IMessage, IUser, IRoom } from '@rocket.chat/core-typings';
+import { isRoomFederated } from '@rocket.chat/core-typings';
 import { MessageToolbox, MessageToolboxItem } from '@rocket.chat/fuselage';
 import { useUser, useUserSubscription, useSettings, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, memo, useMemo } from 'react';
+import type { FC } from 'react';
+import React, { memo, useMemo } from 'react';
 
-import { MessageAction, MessageActionContext } from '../../../../../../app/ui-utils/client/lib/MessageAction';
+import type { MessageActionContext } from '../../../../../../app/ui-utils/client/lib/MessageAction';
+import { MessageAction } from '../../../../../../app/ui-utils/client/lib/MessageAction';
 import { useChat } from '../../../contexts/ChatContext';
 import { useRoom } from '../../../contexts/RoomContext';
 import { useToolboxContext } from '../../../contexts/ToolboxContext';
diff --git a/apps/meteor/client/views/room/MessageList/components/Toolbox/ToolboxDropdown.tsx b/apps/meteor/client/views/room/MessageList/components/Toolbox/ToolboxDropdown.tsx
index cb8ee09c921..0c554595bd0 100644
--- a/apps/meteor/client/views/room/MessageList/components/Toolbox/ToolboxDropdown.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/Toolbox/ToolboxDropdown.tsx
@@ -1,7 +1,8 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box } from '@rocket.chat/fuselage';
 import { useLayout } from '@rocket.chat/ui-contexts';
-import React, { ReactNode, useRef, ReactElement } from 'react';
+import type { ReactNode, ReactElement } from 'react';
+import React, { useRef } from 'react';
 
 import { ToolboxDropdownDesktop } from './ToolboxDropdownDesktop';
 import { ToolboxDropdownMobile } from './ToolboxDropdownMobile';
diff --git a/apps/meteor/client/views/room/MessageList/components/Toolbox/ToolboxDropdownDesktop.tsx b/apps/meteor/client/views/room/MessageList/components/Toolbox/ToolboxDropdownDesktop.tsx
index 18674f6305b..02467f47989 100644
--- a/apps/meteor/client/views/room/MessageList/components/Toolbox/ToolboxDropdownDesktop.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/Toolbox/ToolboxDropdownDesktop.tsx
@@ -1,6 +1,7 @@
 import { Tile } from '@rocket.chat/fuselage';
 import { usePosition } from '@rocket.chat/fuselage-hooks';
-import React, { forwardRef, ReactNode, RefObject } from 'react';
+import type { ReactNode, RefObject } from 'react';
+import React, { forwardRef } from 'react';
 
 export const ToolboxDropdownDesktop = forwardRef<
 	HTMLElement,
diff --git a/apps/meteor/client/views/room/MessageList/components/Toolbox/ToolboxDropdownMobile.tsx b/apps/meteor/client/views/room/MessageList/components/Toolbox/ToolboxDropdownMobile.tsx
index 686a759ac57..54f0924ffc9 100644
--- a/apps/meteor/client/views/room/MessageList/components/Toolbox/ToolboxDropdownMobile.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/Toolbox/ToolboxDropdownMobile.tsx
@@ -1,5 +1,6 @@
 import { Tile } from '@rocket.chat/fuselage';
-import React, { forwardRef, ReactNode } from 'react';
+import type { ReactNode } from 'react';
+import React, { forwardRef } from 'react';
 
 import ScrollableContentWrapper from '../../../../../components/ScrollableContentWrapper';
 
diff --git a/apps/meteor/client/views/room/MessageList/components/Toolbox/ToolboxWrapper.tsx b/apps/meteor/client/views/room/MessageList/components/Toolbox/ToolboxWrapper.tsx
index f1d799e11c4..a5126490817 100644
--- a/apps/meteor/client/views/room/MessageList/components/Toolbox/ToolboxWrapper.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/Toolbox/ToolboxWrapper.tsx
@@ -1,6 +1,7 @@
 import type { IMessage } from '@rocket.chat/core-typings';
 import { MessageToolboxWrapper } from '@rocket.chat/fuselage';
-import React, { FC, memo, useRef } from 'react';
+import type { FC } from 'react';
+import React, { memo, useRef } from 'react';
 
 import { useIsVisible } from '../../../hooks/useIsVisible';
 import Toolbox from './Toolbox';
diff --git a/apps/meteor/client/views/room/MessageList/components/UrlPreview/OEmbedCollapsible.tsx b/apps/meteor/client/views/room/MessageList/components/UrlPreview/OEmbedCollapsible.tsx
index d2f45f7a515..1c62093ffe3 100644
--- a/apps/meteor/client/views/room/MessageList/components/UrlPreview/OEmbedCollapsible.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/UrlPreview/OEmbedCollapsible.tsx
@@ -1,6 +1,7 @@
 import { MessageGenericPreview, Box } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, ReactNode } from 'react';
+import type { ReactElement, ReactNode } from 'react';
+import React from 'react';
 
 import { useCollapse } from '../../../../../components/message/Attachments/hooks/useCollapse';
 import OEmbedPreviewContent from './OEmbedPreviewContent';
diff --git a/apps/meteor/client/views/room/MessageList/components/UrlPreview/OEmbedHtmlPreview.tsx b/apps/meteor/client/views/room/MessageList/components/UrlPreview/OEmbedHtmlPreview.tsx
index e1023664422..e349f41c69b 100644
--- a/apps/meteor/client/views/room/MessageList/components/UrlPreview/OEmbedHtmlPreview.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/UrlPreview/OEmbedHtmlPreview.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import OEmbedCollapsible from './OEmbedCollapsible';
 import type { PreviewMetadata } from './PreviewList';
diff --git a/apps/meteor/client/views/room/MessageList/components/UrlPreview/OEmbedImagePreview.tsx b/apps/meteor/client/views/room/MessageList/components/UrlPreview/OEmbedImagePreview.tsx
index 008ab66a55b..f4630e4826f 100644
--- a/apps/meteor/client/views/room/MessageList/components/UrlPreview/OEmbedImagePreview.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/UrlPreview/OEmbedImagePreview.tsx
@@ -1,5 +1,6 @@
 import { MessageGenericPreviewCoverImage } from '@rocket.chat/fuselage';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import OEmbedCollapsible from './OEmbedCollapsible';
 import type { PreviewMetadata } from './PreviewList';
diff --git a/apps/meteor/client/views/room/MessageList/components/UrlPreview/OEmbedLinkPreview.tsx b/apps/meteor/client/views/room/MessageList/components/UrlPreview/OEmbedLinkPreview.tsx
index 36025daf28b..2de5709045d 100644
--- a/apps/meteor/client/views/room/MessageList/components/UrlPreview/OEmbedLinkPreview.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/UrlPreview/OEmbedLinkPreview.tsx
@@ -1,6 +1,7 @@
 import { MessageGenericPreviewCoverImage } from '@rocket.chat/fuselage';
 import { ExternalLink } from '@rocket.chat/ui-client';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import OEmbedCollapsible from './OEmbedCollapsible';
 import type { PreviewMetadata } from './PreviewList';
diff --git a/apps/meteor/client/views/room/MessageList/components/UrlPreview/OEmbedPreviewContent.tsx b/apps/meteor/client/views/room/MessageList/components/UrlPreview/OEmbedPreviewContent.tsx
index f60e237ea82..bc356a64804 100644
--- a/apps/meteor/client/views/room/MessageList/components/UrlPreview/OEmbedPreviewContent.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/UrlPreview/OEmbedPreviewContent.tsx
@@ -5,7 +5,8 @@ import {
 	MessageGenericPreviewFooter,
 	Box,
 } from '@rocket.chat/fuselage';
-import React, { ReactElement, ReactNode } from 'react';
+import type { ReactElement, ReactNode } from 'react';
+import React from 'react';
 
 import MarkdownText from '../../../../../components/MarkdownText';
 import type { PreviewMetadata } from './PreviewList';
diff --git a/apps/meteor/client/views/room/MessageList/components/UrlPreview/OEmbedResolver.tsx b/apps/meteor/client/views/room/MessageList/components/UrlPreview/OEmbedResolver.tsx
index e1afe784496..9a747cdf39b 100644
--- a/apps/meteor/client/views/room/MessageList/components/UrlPreview/OEmbedResolver.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/UrlPreview/OEmbedResolver.tsx
@@ -1,4 +1,5 @@
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import OEmbedHtmlPreview from './OEmbedHtmlPreview';
 import OEmbedImagePreview from './OEmbedImagePreview';
diff --git a/apps/meteor/client/views/room/MessageList/components/UrlPreview/PreviewList.tsx b/apps/meteor/client/views/room/MessageList/components/UrlPreview/PreviewList.tsx
index d6c4d6b8cf7..820d1c3d0f9 100644
--- a/apps/meteor/client/views/room/MessageList/components/UrlPreview/PreviewList.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/UrlPreview/PreviewList.tsx
@@ -1,5 +1,6 @@
 import { MessageBlock } from '@rocket.chat/fuselage';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { useMessageOembedMaxWidth } from '../../../contexts/MessageContext';
 import { isValidLink } from '../../lib/isValidLink';
@@ -35,7 +36,7 @@ export type PreviewMetadata = Partial<{
 	html?: string; // for embedded OembedType
 }>;
 
-export type UrlPreview = {
+export type UrlPreviewMetadata = {
 	type: 'image' | 'video' | 'audio';
 	originalType: string;
 	url: string;
@@ -47,7 +48,7 @@ type PreviewTypes = 'headers' | 'oembed';
 
 type PreviewData = {
 	type: PreviewTypes;
-	data: PreviewMetadata | UrlPreview;
+	data: PreviewMetadata | UrlPreviewMetadata;
 };
 
 export const buildImageURL = (url: string, imageUrl: string): string => {
@@ -95,7 +96,7 @@ const normalizeMeta = ({ url, meta }: OembedUrlLegacy): PreviewMetadata => {
 const hasContentType = (headers: OembedUrlLegacy['headers']): headers is { contentType: string } =>
 	headers ? 'contentType' in headers : false;
 
-const getHeaderType = (headers: OembedUrlLegacy['headers']): UrlPreview['type'] | undefined => {
+const getHeaderType = (headers: OembedUrlLegacy['headers']): UrlPreviewMetadata['type'] | undefined => {
 	if (!hasContentType(headers)) {
 		return;
 	}
diff --git a/apps/meteor/client/views/room/MessageList/components/UrlPreview/UrlAudioPreview.tsx b/apps/meteor/client/views/room/MessageList/components/UrlPreview/UrlAudioPreview.tsx
index f91a9e1a2ef..b6c2255f6d7 100644
--- a/apps/meteor/client/views/room/MessageList/components/UrlPreview/UrlAudioPreview.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/UrlPreview/UrlAudioPreview.tsx
@@ -1,8 +1,9 @@
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
-import type { UrlPreview } from './PreviewList';
+import type { UrlPreviewMetadata } from './PreviewList';
 
-const UrlAudioPreview = ({ url }: Pick<UrlPreview, 'url'>): ReactElement => (
+const UrlAudioPreview = ({ url }: Pick<UrlPreviewMetadata, 'url'>): ReactElement => (
 	<audio controls>
 		<source src={url} />
 		Your browser doesn't support the audio element.
diff --git a/apps/meteor/client/views/room/MessageList/components/UrlPreview/UrlImagePreview.tsx b/apps/meteor/client/views/room/MessageList/components/UrlPreview/UrlImagePreview.tsx
index c80cb295d8f..c7837809245 100644
--- a/apps/meteor/client/views/room/MessageList/components/UrlPreview/UrlImagePreview.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/UrlPreview/UrlImagePreview.tsx
@@ -1,10 +1,11 @@
 import { Box, MessageGenericPreviewImage } from '@rocket.chat/fuselage';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { useMessageOembedMaxHeight, useMessageOembedMaxWidth } from '../../../contexts/MessageContext';
-import type { UrlPreview } from './PreviewList';
+import type { UrlPreviewMetadata } from './PreviewList';
 
-const UrlImagePreview = ({ url }: Pick<UrlPreview, 'url'>): ReactElement => {
+const UrlImagePreview = ({ url }: Pick<UrlPreviewMetadata, 'url'>): ReactElement => {
 	const oembedMaxWidth = useMessageOembedMaxWidth();
 	const oembedMaxHeight = useMessageOembedMaxHeight();
 
diff --git a/apps/meteor/client/views/room/MessageList/components/UrlPreview/UrlPreview.tsx b/apps/meteor/client/views/room/MessageList/components/UrlPreview/UrlPreview.tsx
index 40f9e73ce27..5ffd29ec9fa 100644
--- a/apps/meteor/client/views/room/MessageList/components/UrlPreview/UrlPreview.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/UrlPreview/UrlPreview.tsx
@@ -1,12 +1,13 @@
 import { Box } from '@rocket.chat/fuselage';
 import { useAttachmentAutoLoadEmbedMedia, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { useCollapse } from '../../../../../components/message/Attachments/hooks/useCollapse';
-import type { UrlPreview as UrlPreviewType } from './PreviewList';
+import type { UrlPreviewMetadata } from './PreviewList';
 import UrlPreviewResolver from './UrlPreviewResolver';
 
-const UrlPreview = (props: UrlPreviewType): ReactElement => {
+const UrlPreview = (props: UrlPreviewMetadata): ReactElement => {
 	const autoLoadMedia = useAttachmentAutoLoadEmbedMedia();
 	const [collapsed, collapse] = useCollapse(!autoLoadMedia);
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/room/MessageList/components/UrlPreview/UrlPreviewResolver.tsx b/apps/meteor/client/views/room/MessageList/components/UrlPreview/UrlPreviewResolver.tsx
index 088d0b208bd..2e6a909538d 100644
--- a/apps/meteor/client/views/room/MessageList/components/UrlPreview/UrlPreviewResolver.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/UrlPreview/UrlPreviewResolver.tsx
@@ -1,11 +1,12 @@
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
-import type { UrlPreview } from './PreviewList';
+import type { UrlPreviewMetadata } from './PreviewList';
 import UrlAudioPreview from './UrlAudioPreview';
 import UrlImagePreview from './UrlImagePreview';
 import UrlVideoPreview from './UrlVideoPreview';
 
-const UrlPreviewResolver = ({ url, type, originalType }: UrlPreview): ReactElement | null => {
+const UrlPreviewResolver = ({ url, type, originalType }: UrlPreviewMetadata): ReactElement | null => {
 	switch (type) {
 		case 'audio':
 			return <UrlAudioPreview url={url} />;
diff --git a/apps/meteor/client/views/room/MessageList/components/UrlPreview/UrlVideoPreview.tsx b/apps/meteor/client/views/room/MessageList/components/UrlPreview/UrlVideoPreview.tsx
index ab27e47e794..f240b4fa8c4 100644
--- a/apps/meteor/client/views/room/MessageList/components/UrlPreview/UrlVideoPreview.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/UrlPreview/UrlVideoPreview.tsx
@@ -1,9 +1,10 @@
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
-import type { UrlPreview } from './PreviewList';
+import type { UrlPreviewMetadata } from './PreviewList';
 
 const style = { maxWidth: '100%' };
-const UrlVideoPreview = ({ url, originalType }: Omit<UrlPreview, 'type'>): ReactElement => (
+const UrlVideoPreview = ({ url, originalType }: Omit<UrlPreviewMetadata, 'type'>): ReactElement => (
 	<video controls style={style}>
 		<source src={url} type={originalType} />
 		Your browser doesn't support the video element.
diff --git a/apps/meteor/client/views/room/MessageList/contexts/MessageHighlightContext.tsx b/apps/meteor/client/views/room/MessageList/contexts/MessageHighlightContext.tsx
index a6ab7b9be9f..c41e5d1dd46 100644
--- a/apps/meteor/client/views/room/MessageList/contexts/MessageHighlightContext.tsx
+++ b/apps/meteor/client/views/room/MessageList/contexts/MessageHighlightContext.tsx
@@ -1,4 +1,4 @@
-import { IMessage } from '@rocket.chat/core-typings';
+import type { IMessage } from '@rocket.chat/core-typings';
 import { createContext, useContext } from 'react';
 
 type MessageHighlightContextValue = {
diff --git a/apps/meteor/client/views/room/MessageList/contexts/MessageListContext.tsx b/apps/meteor/client/views/room/MessageList/contexts/MessageListContext.tsx
index fef14113ecc..bc0fe3dd776 100644
--- a/apps/meteor/client/views/room/MessageList/contexts/MessageListContext.tsx
+++ b/apps/meteor/client/views/room/MessageList/contexts/MessageListContext.tsx
@@ -1,4 +1,4 @@
-import { IMessage, MessageAttachment } from '@rocket.chat/core-typings';
+import type { IMessage, MessageAttachment } from '@rocket.chat/core-typings';
 import { createContext, useContext } from 'react';
 
 export type MessageListContextValue = {
diff --git a/apps/meteor/client/views/room/MessageList/hooks/useMessageBody.tsx b/apps/meteor/client/views/room/MessageList/hooks/useMessageBody.tsx
index f65a72f20cb..55c98ec5352 100644
--- a/apps/meteor/client/views/room/MessageList/hooks/useMessageBody.tsx
+++ b/apps/meteor/client/views/room/MessageList/hooks/useMessageBody.tsx
@@ -1,4 +1,4 @@
-import { IMessage } from '@rocket.chat/core-typings';
+import type { IMessage } from '@rocket.chat/core-typings';
 import { useMemo } from 'react';
 
 export const useMessageBody = ({ attachments, msg }: Partial<Pick<IMessage, 'msg' | 'attachments'>> = {}): string =>
diff --git a/apps/meteor/client/views/room/MessageList/hooks/useMessages.ts b/apps/meteor/client/views/room/MessageList/hooks/useMessages.ts
index 6b279f44093..f27127a85c7 100644
--- a/apps/meteor/client/views/room/MessageList/hooks/useMessages.ts
+++ b/apps/meteor/client/views/room/MessageList/hooks/useMessages.ts
@@ -1,17 +1,14 @@
-import { IRoom, IMessage } from '@rocket.chat/core-typings';
+import type { IRoom, IMessage } from '@rocket.chat/core-typings';
 import { useStableArray } from '@rocket.chat/fuselage-hooks';
 import { useSetting } from '@rocket.chat/ui-contexts';
-import { Mongo } from 'meteor/mongo';
+import type { Mongo } from 'meteor/mongo';
 import { useCallback, useMemo } from 'react';
 
 import { ChatMessage } from '../../../../../app/models/client';
 import { useReactiveValue } from '../../../../hooks/useReactiveValue';
 import { useMessageListContext } from '../contexts/MessageListContext';
-import {
-	MessageWithMdEnforced,
-	parseMessageTextToAstMarkdown,
-	removePossibleNullMessageValues,
-} from '../lib/parseMessageTextToAstMarkdown';
+import type { MessageWithMdEnforced } from '../lib/parseMessageTextToAstMarkdown';
+import { parseMessageTextToAstMarkdown, removePossibleNullMessageValues } from '../lib/parseMessageTextToAstMarkdown';
 
 const options = {
 	sort: {
diff --git a/apps/meteor/client/views/room/MessageList/hooks/useParentMessage.ts b/apps/meteor/client/views/room/MessageList/hooks/useParentMessage.ts
index 20a6743f81e..3eaf56ca20f 100644
--- a/apps/meteor/client/views/room/MessageList/hooks/useParentMessage.ts
+++ b/apps/meteor/client/views/room/MessageList/hooks/useParentMessage.ts
@@ -1,5 +1,6 @@
-import { IMessage } from '@rocket.chat/core-typings';
-import { useQuery, UseQueryResult } from '@tanstack/react-query';
+import type { IMessage } from '@rocket.chat/core-typings';
+import type { UseQueryResult } from '@tanstack/react-query';
+import { useQuery } from '@tanstack/react-query';
 
 import { findParentMessage } from '../../../../../app/ui-message/client/messageThread';
 
diff --git a/apps/meteor/client/views/room/MessageList/lib/isMessageNewDay.ts b/apps/meteor/client/views/room/MessageList/lib/isMessageNewDay.ts
index 56ec75caeac..65d6cec34e4 100644
--- a/apps/meteor/client/views/room/MessageList/lib/isMessageNewDay.ts
+++ b/apps/meteor/client/views/room/MessageList/lib/isMessageNewDay.ts
@@ -1,4 +1,4 @@
-import { IMessage } from '@rocket.chat/core-typings';
+import type { IMessage } from '@rocket.chat/core-typings';
 import { isSameDay } from 'date-fns';
 
 export const isMessageNewDay = (current: IMessage, previous: IMessage | undefined): boolean =>
diff --git a/apps/meteor/client/views/room/MessageList/lib/isMessageSequential.ts b/apps/meteor/client/views/room/MessageList/lib/isMessageSequential.ts
index 3c5c9fa3d55..0a736d1c8e2 100644
--- a/apps/meteor/client/views/room/MessageList/lib/isMessageSequential.ts
+++ b/apps/meteor/client/views/room/MessageList/lib/isMessageSequential.ts
@@ -1,4 +1,4 @@
-import { IMessage } from '@rocket.chat/core-typings';
+import type { IMessage } from '@rocket.chat/core-typings';
 import { differenceInSeconds } from 'date-fns';
 
 import { MessageTypes } from '../../../../../app/ui-utils/lib/MessageTypes';
diff --git a/apps/meteor/client/views/room/MessageList/lib/isParsedMessage.ts b/apps/meteor/client/views/room/MessageList/lib/isParsedMessage.ts
index d45d7765692..b822cce6965 100644
--- a/apps/meteor/client/views/room/MessageList/lib/isParsedMessage.ts
+++ b/apps/meteor/client/views/room/MessageList/lib/isParsedMessage.ts
@@ -1,3 +1,3 @@
-import { Root } from '@rocket.chat/message-parser';
+import type { Root } from '@rocket.chat/message-parser';
 
 export const isParsedMessage = (text: string | Root): text is Root => Array.isArray(text) && text.length > 0;
diff --git a/apps/meteor/client/views/room/MessageList/lib/parseMessageTextToAstMarkdown.ts b/apps/meteor/client/views/room/MessageList/lib/parseMessageTextToAstMarkdown.ts
index dc94e358232..0d3b52e2c74 100644
--- a/apps/meteor/client/views/room/MessageList/lib/parseMessageTextToAstMarkdown.ts
+++ b/apps/meteor/client/views/room/MessageList/lib/parseMessageTextToAstMarkdown.ts
@@ -1,13 +1,7 @@
-import {
-	IMessage,
-	isE2EEMessage,
-	isOTRMessage,
-	isQuoteAttachment,
-	isTranslatedMessage,
-	MessageAttachment,
-	MessageQuoteAttachment,
-} from '@rocket.chat/core-typings';
-import { Options, parse, Root } from '@rocket.chat/message-parser';
+import type { IMessage, MessageAttachment, MessageQuoteAttachment } from '@rocket.chat/core-typings';
+import { isE2EEMessage, isOTRMessage, isQuoteAttachment, isTranslatedMessage } from '@rocket.chat/core-typings';
+import type { Options, Root } from '@rocket.chat/message-parser';
+import { parse } from '@rocket.chat/message-parser';
 
 import { isParsedMessage } from './isParsedMessage';
 
diff --git a/apps/meteor/client/views/room/MessageList/providers/MessageHighlightProvider.tsx b/apps/meteor/client/views/room/MessageList/providers/MessageHighlightProvider.tsx
index a9aec5439b6..bb4177f7d97 100644
--- a/apps/meteor/client/views/room/MessageList/providers/MessageHighlightProvider.tsx
+++ b/apps/meteor/client/views/room/MessageList/providers/MessageHighlightProvider.tsx
@@ -1,4 +1,5 @@
-import React, { ReactElement, ContextType, useMemo, ReactNode } from 'react';
+import type { ReactElement, ContextType, ReactNode } from 'react';
+import React, { useMemo } from 'react';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
 
 import MessageHighlightContext from '../contexts/MessageHighlightContext';
diff --git a/apps/meteor/client/views/room/MessageList/providers/MessageListProvider.tsx b/apps/meteor/client/views/room/MessageList/providers/MessageListProvider.tsx
index 6d11efa9c12..f834293e484 100644
--- a/apps/meteor/client/views/room/MessageList/providers/MessageListProvider.tsx
+++ b/apps/meteor/client/views/room/MessageList/providers/MessageListProvider.tsx
@@ -1,20 +1,16 @@
-import {
-	IRoom,
-	IMessage,
-	isTranslatedMessage,
-	isMessageReactionsNormalized,
-	MessageAttachment,
-	isThreadMainMessage,
-} from '@rocket.chat/core-typings';
+import type { IRoom, IMessage, MessageAttachment } from '@rocket.chat/core-typings';
+import { isTranslatedMessage, isMessageReactionsNormalized, isThreadMainMessage } from '@rocket.chat/core-typings';
 import { useLayout, useUser, useUserPreference, useUserSubscription, useSetting, useEndpoint } from '@rocket.chat/ui-contexts';
-import React, { useMemo, FC, memo } from 'react';
+import type { FC } from 'react';
+import React, { useMemo, memo } from 'react';
 
 import { AutoTranslate } from '../../../../../app/autotranslate/client';
 import { EmojiPicker } from '../../../../../app/emoji/client';
 import { getRegexHighlight, getRegexHighlightUrl } from '../../../../../app/highlight-words/client/helper';
 import { useRoom } from '../../contexts/RoomContext';
 import ToolboxProvider from '../../providers/ToolboxProvider';
-import { MessageListContext, MessageListContextValue } from '../contexts/MessageListContext';
+import type { MessageListContextValue } from '../contexts/MessageListContext';
+import { MessageListContext } from '../contexts/MessageListContext';
 import { useAutotranslateLanguage } from '../hooks/useAutotranslateLanguage';
 
 const fields = {};
diff --git a/apps/meteor/client/views/room/MessageList/providers/messageHighlightSubscription.ts b/apps/meteor/client/views/room/MessageList/providers/messageHighlightSubscription.ts
index 31958e76ee0..d38856a077e 100644
--- a/apps/meteor/client/views/room/MessageList/providers/messageHighlightSubscription.ts
+++ b/apps/meteor/client/views/room/MessageList/providers/messageHighlightSubscription.ts
@@ -1,4 +1,4 @@
-import { IMessage } from '@rocket.chat/core-typings';
+import type { IMessage } from '@rocket.chat/core-typings';
 
 type SetHighlightFn = (_id: IMessage['_id']) => void;
 type ClearHighlightFn = () => void;
diff --git a/apps/meteor/client/views/room/Room/ComposerSkeleton.tsx b/apps/meteor/client/views/room/Room/ComposerSkeleton.tsx
index 58855ead2fc..acd7d05a740 100644
--- a/apps/meteor/client/views/room/Room/ComposerSkeleton.tsx
+++ b/apps/meteor/client/views/room/Room/ComposerSkeleton.tsx
@@ -1,5 +1,6 @@
 import { Box, InputBox } from '@rocket.chat/fuselage';
-import React, { FC, memo } from 'react';
+import type { FC } from 'react';
+import React, { memo } from 'react';
 
 const ComposerSkeleton: FC = () => (
 	<Box padding={24} display='flex'>
diff --git a/apps/meteor/client/views/room/Room/Room.tsx b/apps/meteor/client/views/room/Room/Room.tsx
index 50859e346c8..34db30267d8 100644
--- a/apps/meteor/client/views/room/Room/Room.tsx
+++ b/apps/meteor/client/views/room/Room/Room.tsx
@@ -1,5 +1,6 @@
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { createElement, memo, ReactElement, Suspense } from 'react';
+import type { ReactElement } from 'react';
+import React, { createElement, memo, Suspense } from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
 
 import VerticalBarSkeleton from '../../../components/VerticalBar/VerticalBarSkeleton';
diff --git a/apps/meteor/client/views/room/RoomNotFound.tsx b/apps/meteor/client/views/room/RoomNotFound.tsx
index 5a39be7576d..b47710283e3 100644
--- a/apps/meteor/client/views/room/RoomNotFound.tsx
+++ b/apps/meteor/client/views/room/RoomNotFound.tsx
@@ -1,7 +1,8 @@
 import { States, StatesIcon, StatesTitle, StatesSubtitle, Box, StatesActions, StatesAction } from '@rocket.chat/fuselage';
 import { Header as TemplateHeader } from '@rocket.chat/ui-client';
 import { useLayout, useRoute, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import BurgerMenu from '../../components/BurgerMenu';
 import RoomLayout from './layout/RoomLayout';
diff --git a/apps/meteor/client/views/room/RoomSkeleton.tsx b/apps/meteor/client/views/room/RoomSkeleton.tsx
index 780eda051da..f1b26290e52 100644
--- a/apps/meteor/client/views/room/RoomSkeleton.tsx
+++ b/apps/meteor/client/views/room/RoomSkeleton.tsx
@@ -1,6 +1,7 @@
 import { Skeleton, Box } from '@rocket.chat/fuselage';
 import { Header } from '@rocket.chat/ui-client';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import VerticalBarSkeleton from '../../components/VerticalBar/VerticalBarSkeleton';
 import ComposerSkeleton from './Room/ComposerSkeleton';
diff --git a/apps/meteor/client/views/room/ShareLocation/ShareLocationModal.tsx b/apps/meteor/client/views/room/ShareLocation/ShareLocationModal.tsx
index 66b7d9c0bb9..f3750b97eba 100644
--- a/apps/meteor/client/views/room/ShareLocation/ShareLocationModal.tsx
+++ b/apps/meteor/client/views/room/ShareLocation/ShareLocationModal.tsx
@@ -1,7 +1,8 @@
-import { IMessage, IRoom } from '@rocket.chat/core-typings';
+import type { IMessage, IRoom } from '@rocket.chat/core-typings';
 import { useEndpoint, useTranslation, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import { useQuery, useQueryClient } from '@tanstack/react-query';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import GenericModal from '../../../components/GenericModal';
 import MapView from '../../location/MapView';
diff --git a/apps/meteor/client/views/room/UserCard/UserCardWithData.tsx b/apps/meteor/client/views/room/UserCard/UserCardWithData.tsx
index d485444fca9..497bfbaf910 100644
--- a/apps/meteor/client/views/room/UserCard/UserCardWithData.tsx
+++ b/apps/meteor/client/views/room/UserCard/UserCardWithData.tsx
@@ -1,8 +1,9 @@
-import { IRoom } from '@rocket.chat/core-typings';
+import type { IRoom } from '@rocket.chat/core-typings';
 import { PositionAnimated, AnimatedVisibility, Menu, Option } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useSetting, useRolesDescription } from '@rocket.chat/ui-contexts';
-import React, { useMemo, useRef, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo, useRef } from 'react';
 
 import { Backdrop } from '../../../components/Backdrop';
 import LocalTime from '../../../components/LocalTime';
diff --git a/apps/meteor/client/views/room/components/BlazeTemplate.tsx b/apps/meteor/client/views/room/components/BlazeTemplate.tsx
index 3c8ac79ea88..42d3e08eb25 100644
--- a/apps/meteor/client/views/room/components/BlazeTemplate.tsx
+++ b/apps/meteor/client/views/room/components/BlazeTemplate.tsx
@@ -1,7 +1,8 @@
 import { Box } from '@rocket.chat/fuselage';
 import { Blaze } from 'meteor/blaze';
 import { Template } from 'meteor/templating';
-import React, { ComponentProps, FC, memo, useLayoutEffect, useRef } from 'react';
+import type { ComponentProps, FC } from 'react';
+import React, { memo, useLayoutEffect, useRef } from 'react';
 
 const BlazeTemplate: FC<
 	Omit<ComponentProps<typeof Box>, 'children'> & {
diff --git a/apps/meteor/client/views/room/components/VerticalBarOldActions.tsx b/apps/meteor/client/views/room/components/VerticalBarOldActions.tsx
index e41b3abb2a0..f8455088396 100644
--- a/apps/meteor/client/views/room/components/VerticalBarOldActions.tsx
+++ b/apps/meteor/client/views/room/components/VerticalBarOldActions.tsx
@@ -1,10 +1,13 @@
-import { IRoom } from '@rocket.chat/core-typings';
-import { Icon } from '@rocket.chat/fuselage';
-import { useTranslation, TranslationKey } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, ComponentProps } from 'react';
+import type { IRoom } from '@rocket.chat/core-typings';
+import type { Icon } from '@rocket.chat/fuselage';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
+import type { ReactElement, ComponentProps } from 'react';
+import React from 'react';
 
 import VerticalBar from '../../../components/VerticalBar';
-import { ToolboxContextValue, useTabBarClose } from '../contexts/ToolboxContext';
+import type { ToolboxContextValue } from '../contexts/ToolboxContext';
+import { useTabBarClose } from '../contexts/ToolboxContext';
 import BlazeTemplate from './BlazeTemplate';
 
 type VerticalBarOldActionsProps = {
diff --git a/apps/meteor/client/views/room/components/body/DropTargetOverlay.tsx b/apps/meteor/client/views/room/components/body/DropTargetOverlay.tsx
index c28f7c2b324..2d854c05ae7 100644
--- a/apps/meteor/client/views/room/components/body/DropTargetOverlay.tsx
+++ b/apps/meteor/client/views/room/components/body/DropTargetOverlay.tsx
@@ -2,7 +2,8 @@ import { css } from '@rocket.chat/css-in-js';
 import { Box } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { DragEvent, memo, ReactElement, ReactNode } from 'react';
+import type { DragEvent, ReactElement, ReactNode } from 'react';
+import React, { memo } from 'react';
 
 import { useFormatDateAndTime } from '../../../../hooks/useFormatDateAndTime';
 
diff --git a/apps/meteor/client/views/room/components/body/ErroredUploadProgressIndicator.tsx b/apps/meteor/client/views/room/components/body/ErroredUploadProgressIndicator.tsx
index 5941a8ba3d4..95a29d767ab 100644
--- a/apps/meteor/client/views/room/components/body/ErroredUploadProgressIndicator.tsx
+++ b/apps/meteor/client/views/room/components/body/ErroredUploadProgressIndicator.tsx
@@ -1,7 +1,8 @@
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useCallback } from 'react';
+import type { ReactElement } from 'react';
+import React, { useCallback } from 'react';
 
-import { Upload } from '../../../../lib/chats/Upload';
+import type { Upload } from '../../../../lib/chats/Upload';
 
 type ErroredUploadProgressIndicatorProps = {
 	id: Upload['id'];
diff --git a/apps/meteor/client/views/room/components/body/JumpToRecentMessagesBar.tsx b/apps/meteor/client/views/room/components/body/JumpToRecentMessagesBar.tsx
index e334ee8892e..b41000a7f30 100644
--- a/apps/meteor/client/views/room/components/body/JumpToRecentMessagesBar.tsx
+++ b/apps/meteor/client/views/room/components/body/JumpToRecentMessagesBar.tsx
@@ -1,5 +1,6 @@
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, UIEvent } from 'react';
+import type { ReactElement, UIEvent } from 'react';
+import React from 'react';
 
 import { isTruthy } from '../../../../../lib/isTruthy';
 
diff --git a/apps/meteor/client/views/room/components/body/LeaderBar.tsx b/apps/meteor/client/views/room/components/body/LeaderBar.tsx
index edc46133096..1392597e04f 100644
--- a/apps/meteor/client/views/room/components/body/LeaderBar.tsx
+++ b/apps/meteor/client/views/room/components/body/LeaderBar.tsx
@@ -1,6 +1,7 @@
-import { IUser } from '@rocket.chat/core-typings';
+import type { IUser } from '@rocket.chat/core-typings';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { memo, ReactElement, ReactNode, UIEvent, useCallback, useMemo } from 'react';
+import type { ReactElement, ReactNode, UIEvent } from 'react';
+import React, { memo, useCallback, useMemo } from 'react';
 
 import { isTruthy } from '../../../../../lib/isTruthy';
 import UserAvatar from '../../../../components/avatar/UserAvatar';
diff --git a/apps/meteor/client/views/room/components/body/LegacyMessageTemplateList.tsx b/apps/meteor/client/views/room/components/body/LegacyMessageTemplateList.tsx
index 8647c196fb5..6831f2df790 100644
--- a/apps/meteor/client/views/room/components/body/LegacyMessageTemplateList.tsx
+++ b/apps/meteor/client/views/room/components/body/LegacyMessageTemplateList.tsx
@@ -1,8 +1,9 @@
-import { IMessage, IRoom, MessageTypesValues } from '@rocket.chat/core-typings';
+import type { IMessage, IRoom, MessageTypesValues } from '@rocket.chat/core-typings';
 import { useSetting } from '@rocket.chat/ui-contexts';
 import { Blaze } from 'meteor/blaze';
 import { Template } from 'meteor/templating';
-import React, { memo, ReactElement, useCallback, useRef } from 'react';
+import type { ReactElement } from 'react';
+import React, { memo, useCallback, useRef } from 'react';
 
 import { ChatMessage } from '../../../../../app/models/client';
 import { useReactiveValue } from '../../../../hooks/useReactiveValue';
diff --git a/apps/meteor/client/views/room/components/body/LoadingMessagesIndicator.tsx b/apps/meteor/client/views/room/components/body/LoadingMessagesIndicator.tsx
index b3277998f24..701a20423e4 100644
--- a/apps/meteor/client/views/room/components/body/LoadingMessagesIndicator.tsx
+++ b/apps/meteor/client/views/room/components/body/LoadingMessagesIndicator.tsx
@@ -1,4 +1,5 @@
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 const LoadingMessagesIndicator = (): ReactElement => (
 	<div className='loading-animation'>
diff --git a/apps/meteor/client/views/room/components/body/NewMessagesButton.tsx b/apps/meteor/client/views/room/components/body/NewMessagesButton.tsx
index 3046b3f8bee..11a29921016 100644
--- a/apps/meteor/client/views/room/components/body/NewMessagesButton.tsx
+++ b/apps/meteor/client/views/room/components/body/NewMessagesButton.tsx
@@ -1,5 +1,6 @@
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, UIEvent } from 'react';
+import type { ReactElement, UIEvent } from 'react';
+import React from 'react';
 
 import { isTruthy } from '../../../../../lib/isTruthy';
 
diff --git a/apps/meteor/client/views/room/components/body/RetentionPolicyWarning.tsx b/apps/meteor/client/views/room/components/body/RetentionPolicyWarning.tsx
index 7defd9a2020..8ae0d1ebafc 100644
--- a/apps/meteor/client/views/room/components/body/RetentionPolicyWarning.tsx
+++ b/apps/meteor/client/views/room/components/body/RetentionPolicyWarning.tsx
@@ -1,6 +1,7 @@
 import { Icon } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useMemo } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo } from 'react';
 
 import { useFormatRelativeTime } from '../../../../hooks/useFormatRelativeTime';
 
diff --git a/apps/meteor/client/views/room/components/body/RoomBody.tsx b/apps/meteor/client/views/room/components/body/RoomBody.tsx
index 679164f3067..122ea38b850 100644
--- a/apps/meteor/client/views/room/components/body/RoomBody.tsx
+++ b/apps/meteor/client/views/room/components/body/RoomBody.tsx
@@ -1,4 +1,5 @@
-import { IMessage, isEditedMessage, isOmnichannelRoom, IUser } from '@rocket.chat/core-typings';
+import type { IMessage, IUser } from '@rocket.chat/core-typings';
+import { isEditedMessage, isOmnichannelRoom } from '@rocket.chat/core-typings';
 import {
 	useCurrentRoute,
 	usePermission,
@@ -10,13 +11,14 @@ import {
 	useUser,
 	useUserPreference,
 } from '@rocket.chat/ui-contexts';
-import React, { memo, ReactElement, UIEvent, useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import type { ReactElement, UIEvent } from 'react';
+import React, { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
 
 import { ChatMessage } from '../../../../../app/models/client';
 import { readMessage, RoomHistoryManager } from '../../../../../app/ui-utils/client';
 import { openUserCard } from '../../../../../app/ui/client/lib/UserCard';
-import { CommonRoomTemplateInstance } from '../../../../../app/ui/client/views/app/lib/CommonRoomTemplateInstance';
+import type { CommonRoomTemplateInstance } from '../../../../../app/ui/client/views/app/lib/CommonRoomTemplateInstance';
 import { getCommonRoomEvents } from '../../../../../app/ui/client/views/app/lib/getCommonRoomEvents';
 import { isAtBottom } from '../../../../../app/ui/client/views/app/lib/scrolling';
 import { callbacks } from '../../../../../lib/callbacks';
@@ -25,7 +27,7 @@ import { withDebouncing, withThrottling } from '../../../../../lib/utils/highOrd
 import { useEmbeddedLayout } from '../../../../hooks/useEmbeddedLayout';
 import { useReactiveQuery } from '../../../../hooks/useReactiveQuery';
 import { RoomManager as NewRoomManager } from '../../../../lib/RoomManager';
-import { Upload } from '../../../../lib/chats/Upload';
+import type { Upload } from '../../../../lib/chats/Upload';
 import { roomCoordinator } from '../../../../lib/rooms/roomCoordinator';
 import Announcement from '../../Announcement';
 import { MessageList } from '../../MessageList/MessageList';
diff --git a/apps/meteor/client/views/room/components/body/RoomForeword.tsx b/apps/meteor/client/views/room/components/body/RoomForeword.tsx
index 7a15a47afc6..74dd2e72f90 100644
--- a/apps/meteor/client/views/room/components/body/RoomForeword.tsx
+++ b/apps/meteor/client/views/room/components/body/RoomForeword.tsx
@@ -1,7 +1,9 @@
-import { IRoom, isVoipRoom, isDirectMessageRoom, IUser } from '@rocket.chat/core-typings';
+import type { IRoom, IUser } from '@rocket.chat/core-typings';
+import { isVoipRoom, isDirectMessageRoom } from '@rocket.chat/core-typings';
 import { Flex, Box, Tag, Icon } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import UserAvatar from '../../../../components/avatar/UserAvatar';
 import { VoipRoomForeword } from '../../../../components/voip/room/VoipRoomForeword';
diff --git a/apps/meteor/client/views/room/components/body/UnreadMessagesIndicator.tsx b/apps/meteor/client/views/room/components/body/UnreadMessagesIndicator.tsx
index 289369a0166..e5627fdbe21 100644
--- a/apps/meteor/client/views/room/components/body/UnreadMessagesIndicator.tsx
+++ b/apps/meteor/client/views/room/components/body/UnreadMessagesIndicator.tsx
@@ -1,5 +1,6 @@
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { useTimeAgo } from '../../../../hooks/useTimeAgo';
 
diff --git a/apps/meteor/client/views/room/components/body/UploadProgressIndicator.tsx b/apps/meteor/client/views/room/components/body/UploadProgressIndicator.tsx
index 844ef4daa54..2739be122ec 100644
--- a/apps/meteor/client/views/room/components/body/UploadProgressIndicator.tsx
+++ b/apps/meteor/client/views/room/components/body/UploadProgressIndicator.tsx
@@ -1,7 +1,8 @@
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useCallback } from 'react';
+import type { ReactElement } from 'react';
+import React, { useCallback } from 'react';
 
-import { Upload } from '../../../../lib/chats/Upload';
+import type { Upload } from '../../../../lib/chats/Upload';
 import ErroredUploadProgressIndicator from './ErroredUploadProgressIndicator';
 
 type UploadProgressIndicatorProps = {
diff --git a/apps/meteor/client/views/room/components/body/composer/ComposerAnonymous.tsx b/apps/meteor/client/views/room/components/body/composer/ComposerAnonymous.tsx
index 0ba7ddabfab..8fe18ed8145 100644
--- a/apps/meteor/client/views/room/components/body/composer/ComposerAnonymous.tsx
+++ b/apps/meteor/client/views/room/components/body/composer/ComposerAnonymous.tsx
@@ -1,5 +1,6 @@
 import { useSetting, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 export const ComposerAnonymous = (): ReactElement => {
 	const isAnonymousWriteEnabled = useSetting('Accounts_AllowAnonymousWrite');
diff --git a/apps/meteor/client/views/room/components/body/composer/ComposerBlocked.tsx b/apps/meteor/client/views/room/components/body/composer/ComposerBlocked.tsx
index a6c09da0982..109f24fdeba 100644
--- a/apps/meteor/client/views/room/components/body/composer/ComposerBlocked.tsx
+++ b/apps/meteor/client/views/room/components/body/composer/ComposerBlocked.tsx
@@ -1,6 +1,7 @@
 import { MessageFooterCallout } from '@rocket.chat/ui-composer';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 export const ComposerBlocked = (): ReactElement => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/room/components/body/composer/ComposerContainer.tsx b/apps/meteor/client/views/room/components/body/composer/ComposerContainer.tsx
index 477d765347c..e5272973a9e 100644
--- a/apps/meteor/client/views/room/components/body/composer/ComposerContainer.tsx
+++ b/apps/meteor/client/views/room/components/body/composer/ComposerContainer.tsx
@@ -1,11 +1,13 @@
 import { isOmnichannelRoom, isVoipRoom } from '@rocket.chat/core-typings';
-import React, { memo, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { memo } from 'react';
 
 import { useRoom } from '../../../contexts/RoomContext';
 import { ComposerAnonymous } from './ComposerAnonymous';
 import { ComposerBlocked } from './ComposerBlocked';
 import { ComposerJoinWithPassword } from './ComposerJoinWithPassword';
-import ComposerMessage, { ComposerMessageProps } from './ComposerMessage';
+import type { ComposerMessageProps } from './ComposerMessage';
+import ComposerMessage from './ComposerMessage';
 import ComposerOmnichannel from './ComposerOmnichannel/ComposerOmnichannel';
 import { ComposerReadOnly } from './ComposerReadOnly';
 import ComposerVoIP from './ComposerVoIP';
diff --git a/apps/meteor/client/views/room/components/body/composer/ComposerJoinWithPassword.tsx b/apps/meteor/client/views/room/components/body/composer/ComposerJoinWithPassword.tsx
index 98641fd4ccc..b1cb18594d0 100644
--- a/apps/meteor/client/views/room/components/body/composer/ComposerJoinWithPassword.tsx
+++ b/apps/meteor/client/views/room/components/body/composer/ComposerJoinWithPassword.tsx
@@ -1,7 +1,8 @@
 import { TextInput } from '@rocket.chat/fuselage';
 import { MessageFooterCallout, MessageFooterCalloutAction, MessageFooterCalloutContent } from '@rocket.chat/ui-composer';
 import { useTranslation, useEndpoint } from '@rocket.chat/ui-contexts';
-import React, { ChangeEvent, ReactElement, useCallback, useState, FormEventHandler } from 'react';
+import type { ChangeEvent, ReactElement, FormEventHandler } from 'react';
+import React, { useCallback, useState } from 'react';
 
 import { useRoom } from '../../../contexts/RoomContext';
 
diff --git a/apps/meteor/client/views/room/components/body/composer/ComposerMessage.tsx b/apps/meteor/client/views/room/components/body/composer/ComposerMessage.tsx
index 1939e3b6f72..2e4c0fd48bd 100644
--- a/apps/meteor/client/views/room/components/body/composer/ComposerMessage.tsx
+++ b/apps/meteor/client/views/room/components/body/composer/ComposerMessage.tsx
@@ -1,16 +1,17 @@
-import { IRoom, ISubscription } from '@rocket.chat/core-typings';
+import type { IRoom, ISubscription } from '@rocket.chat/core-typings';
 import { useSetting, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import { Blaze } from 'meteor/blaze';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
-import React, { ContextType, memo, ReactElement, useCallback, useEffect, useRef } from 'react';
+import type { ContextType, ReactElement } from 'react';
+import React, { memo, useCallback, useEffect, useRef } from 'react';
 
 import type { MessageBoxTemplateInstance } from '../../../../../../app/ui-message/client/messageBox/messageBox';
 import { RoomManager } from '../../../../../../app/ui-utils/client';
 import { useEmbeddedLayout } from '../../../../../hooks/useEmbeddedLayout';
 import { useReactiveValue } from '../../../../../hooks/useReactiveValue';
 import ComposerSkeleton from '../../../Room/ComposerSkeleton';
-import { ChatContext } from '../../../contexts/ChatContext';
+import type { ChatContext } from '../../../contexts/ChatContext';
 
 export type ComposerMessageProps = {
 	rid: IRoom['_id'];
diff --git a/apps/meteor/client/views/room/components/body/composer/ComposerOmnichannel/ComposerOmnichannel.tsx b/apps/meteor/client/views/room/components/body/composer/ComposerOmnichannel/ComposerOmnichannel.tsx
index 9b67da7b7b6..18c1674d899 100644
--- a/apps/meteor/client/views/room/components/body/composer/ComposerOmnichannel/ComposerOmnichannel.tsx
+++ b/apps/meteor/client/views/room/components/body/composer/ComposerOmnichannel/ComposerOmnichannel.tsx
@@ -1,10 +1,12 @@
-import { IOmnichannelRoom } from '@rocket.chat/core-typings';
+import type { IOmnichannelRoom } from '@rocket.chat/core-typings';
 import { MessageFooterCallout } from '@rocket.chat/ui-composer';
 import { useStream, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useEffect, useState } from 'react';
+import type { ReactElement } from 'react';
+import React, { useEffect, useState } from 'react';
 
 import { useOmnichannelRoom, useUserIsSubscribed } from '../../../../contexts/RoomContext';
-import ComposerMessage, { ComposerMessageProps } from '../ComposerMessage';
+import type { ComposerMessageProps } from '../ComposerMessage';
+import ComposerMessage from '../ComposerMessage';
 import { ComposerOmnichannelInquiry } from './ComposerOmnichannelInquiry';
 import { ComposerOmnichannelJoin } from './ComposerOmnichannelJoin';
 import { ComposerOmnichannelOnHold } from './ComposerOmnichannelOnHold';
diff --git a/apps/meteor/client/views/room/components/body/composer/ComposerOmnichannel/ComposerOmnichannelInquiry.tsx b/apps/meteor/client/views/room/components/body/composer/ComposerOmnichannel/ComposerOmnichannelInquiry.tsx
index 5679fd79a9e..b849d7e1ed9 100644
--- a/apps/meteor/client/views/room/components/body/composer/ComposerOmnichannel/ComposerOmnichannelInquiry.tsx
+++ b/apps/meteor/client/views/room/components/body/composer/ComposerOmnichannel/ComposerOmnichannelInquiry.tsx
@@ -1,7 +1,8 @@
 import { MessageFooterCallout, MessageFooterCalloutAction, MessageFooterCalloutContent } from '@rocket.chat/ui-composer';
 import { useEndpoint, useMethod, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { useOmnichannelRoom } from '../../../../contexts/RoomContext';
 
diff --git a/apps/meteor/client/views/room/components/body/composer/ComposerOmnichannel/ComposerOmnichannelJoin.tsx b/apps/meteor/client/views/room/components/body/composer/ComposerOmnichannel/ComposerOmnichannelJoin.tsx
index 6bb8f69df88..0fedb5ec6ea 100644
--- a/apps/meteor/client/views/room/components/body/composer/ComposerOmnichannel/ComposerOmnichannelJoin.tsx
+++ b/apps/meteor/client/views/room/components/body/composer/ComposerOmnichannel/ComposerOmnichannelJoin.tsx
@@ -1,6 +1,7 @@
 import { MessageFooterCallout, MessageFooterCalloutAction, MessageFooterCalloutContent } from '@rocket.chat/ui-composer';
 import { useEndpoint, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { useOmnichannelRoom } from '../../../../contexts/RoomContext';
 
diff --git a/apps/meteor/client/views/room/components/body/composer/ComposerOmnichannel/ComposerOmnichannelOnHold.tsx b/apps/meteor/client/views/room/components/body/composer/ComposerOmnichannel/ComposerOmnichannelOnHold.tsx
index cbac6477676..5fbf1a4744b 100644
--- a/apps/meteor/client/views/room/components/body/composer/ComposerOmnichannel/ComposerOmnichannelOnHold.tsx
+++ b/apps/meteor/client/views/room/components/body/composer/ComposerOmnichannel/ComposerOmnichannelOnHold.tsx
@@ -1,6 +1,7 @@
 import { MessageFooterCallout, MessageFooterCalloutAction, MessageFooterCalloutContent } from '@rocket.chat/ui-composer';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { useOmnichannelRoom } from '../../../../contexts/RoomContext';
 import { useResumeChatOnHoldMutation } from './hooks/useResumeChatOnHoldMutation';
diff --git a/apps/meteor/client/views/room/components/body/composer/ComposerOmnichannel/hooks/useResumeChatOnHoldMutation.ts b/apps/meteor/client/views/room/components/body/composer/ComposerOmnichannel/hooks/useResumeChatOnHoldMutation.ts
index 0b76211b6c8..33160291e26 100644
--- a/apps/meteor/client/views/room/components/body/composer/ComposerOmnichannel/hooks/useResumeChatOnHoldMutation.ts
+++ b/apps/meteor/client/views/room/components/body/composer/ComposerOmnichannel/hooks/useResumeChatOnHoldMutation.ts
@@ -1,6 +1,7 @@
-import { IRoom } from '@rocket.chat/core-typings';
+import type { IRoom } from '@rocket.chat/core-typings';
 import { useMethod } from '@rocket.chat/ui-contexts';
-import { useMutation, UseMutationOptions, UseMutationResult, useQueryClient } from '@tanstack/react-query';
+import type { UseMutationOptions, UseMutationResult } from '@tanstack/react-query';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
 
 export const useResumeChatOnHoldMutation = (
 	options?: Omit<UseMutationOptions<void, Error, IRoom['_id']>, 'mutationFn'>,
diff --git a/apps/meteor/client/views/room/components/body/composer/ComposerOmnichannel/index.tsx b/apps/meteor/client/views/room/components/body/composer/ComposerOmnichannel/index.tsx
index 6c2ea9a42b0..6eb9c7aa1e8 100644
--- a/apps/meteor/client/views/room/components/body/composer/ComposerOmnichannel/index.tsx
+++ b/apps/meteor/client/views/room/components/body/composer/ComposerOmnichannel/index.tsx
@@ -1 +1 @@
-export * from './ComposerOmnichannel';
+export { default } from './ComposerOmnichannel';
diff --git a/apps/meteor/client/views/room/components/body/composer/ComposerReadOnly.tsx b/apps/meteor/client/views/room/components/body/composer/ComposerReadOnly.tsx
index ec7b2e7524e..5a97cffca50 100644
--- a/apps/meteor/client/views/room/components/body/composer/ComposerReadOnly.tsx
+++ b/apps/meteor/client/views/room/components/body/composer/ComposerReadOnly.tsx
@@ -1,6 +1,7 @@
 import { MessageFooterCallout } from '@rocket.chat/ui-composer';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 export const ComposerReadOnly = (): ReactElement => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/room/components/body/composer/ComposerVoIP.tsx b/apps/meteor/client/views/room/components/body/composer/ComposerVoIP.tsx
index 3b0a1a6cd9f..967d7d1f27b 100644
--- a/apps/meteor/client/views/room/components/body/composer/ComposerVoIP.tsx
+++ b/apps/meteor/client/views/room/components/body/composer/ComposerVoIP.tsx
@@ -1,6 +1,7 @@
 import { MessageFooterCallout } from '@rocket.chat/ui-composer';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 const ComposerVoIP = (): ReactElement => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/room/components/body/composer/hooks/useMessageComposerCanJoin.ts b/apps/meteor/client/views/room/components/body/composer/hooks/useMessageComposerCanJoin.ts
index d973e025034..8da44aa10f4 100644
--- a/apps/meteor/client/views/room/components/body/composer/hooks/useMessageComposerCanJoin.ts
+++ b/apps/meteor/client/views/room/components/body/composer/hooks/useMessageComposerCanJoin.ts
@@ -1,4 +1,4 @@
-import { IRoom } from '@rocket.chat/core-typings';
+import type { IRoom } from '@rocket.chat/core-typings';
 import { useCallback } from 'react';
 
 import { useReactiveValue } from '../../../../../../hooks/useReactiveValue';
diff --git a/apps/meteor/client/views/room/components/body/composer/hooks/useMessageComposerIsBlocked.ts b/apps/meteor/client/views/room/components/body/composer/hooks/useMessageComposerIsBlocked.ts
index 6f0ab39f206..7732966af17 100644
--- a/apps/meteor/client/views/room/components/body/composer/hooks/useMessageComposerIsBlocked.ts
+++ b/apps/meteor/client/views/room/components/body/composer/hooks/useMessageComposerIsBlocked.ts
@@ -1,4 +1,5 @@
-import { isDirectMessageRoom, ISubscription } from '@rocket.chat/core-typings';
+import type { ISubscription } from '@rocket.chat/core-typings';
+import { isDirectMessageRoom } from '@rocket.chat/core-typings';
 
 import { useRoom } from '../../../../contexts/RoomContext';
 
diff --git a/apps/meteor/client/views/room/components/body/composer/hooks/useMessageComposerIsReadOnly.ts b/apps/meteor/client/views/room/components/body/composer/hooks/useMessageComposerIsReadOnly.ts
index 8edb3dc15ad..f3a1237b7c1 100644
--- a/apps/meteor/client/views/room/components/body/composer/hooks/useMessageComposerIsReadOnly.ts
+++ b/apps/meteor/client/views/room/components/body/composer/hooks/useMessageComposerIsReadOnly.ts
@@ -1,4 +1,4 @@
-import { ISubscription, IUser } from '@rocket.chat/core-typings';
+import type { ISubscription, IUser } from '@rocket.chat/core-typings';
 import { Meteor } from 'meteor/meteor';
 import { useCallback } from 'react';
 
diff --git a/apps/meteor/client/views/room/components/body/useDropTarget.ts b/apps/meteor/client/views/room/components/body/useDropTarget.ts
index 654e0079f5b..1a116f3d55d 100644
--- a/apps/meteor/client/views/room/components/body/useDropTarget.ts
+++ b/apps/meteor/client/views/room/components/body/useDropTarget.ts
@@ -1,4 +1,6 @@
-import React, { DragEvent, useCallback, useMemo, useState } from 'react';
+import type { DragEvent } from 'react';
+import type React from 'react';
+import { useCallback, useMemo, useState } from 'react';
 
 const hasFilesToUpload = (dataTransfer: DataTransfer): boolean => dataTransfer.types.includes('Files');
 
diff --git a/apps/meteor/client/views/room/components/body/useFileUploadDropTarget.ts b/apps/meteor/client/views/room/components/body/useFileUploadDropTarget.ts
index ec0ff741c5a..21e043928a9 100644
--- a/apps/meteor/client/views/room/components/body/useFileUploadDropTarget.ts
+++ b/apps/meteor/client/views/room/components/body/useFileUploadDropTarget.ts
@@ -1,7 +1,9 @@
-import { IRoom } from '@rocket.chat/core-typings';
+import type { IRoom } from '@rocket.chat/core-typings';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useSetting, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactNode, useCallback, useMemo } from 'react';
+import type { ReactNode } from 'react';
+import type React from 'react';
+import { useCallback, useMemo } from 'react';
 
 import { Users } from '../../../../../app/models/client';
 import { useReactiveValue } from '../../../../hooks/useReactiveValue';
diff --git a/apps/meteor/client/views/room/components/body/useMessageContext.ts b/apps/meteor/client/views/room/components/body/useMessageContext.ts
index a6a911163ff..63cd5ccf8f6 100644
--- a/apps/meteor/client/views/room/components/body/useMessageContext.ts
+++ b/apps/meteor/client/views/room/components/body/useMessageContext.ts
@@ -1,4 +1,4 @@
-import { IRoom } from '@rocket.chat/core-typings';
+import type { IRoom } from '@rocket.chat/core-typings';
 import { useLayout, usePermission, useSetting, useUser, useUserId, useUserPreference } from '@rocket.chat/ui-contexts';
 import { useCallback, useMemo } from 'react';
 
diff --git a/apps/meteor/client/views/room/components/body/useRetentionPolicy.ts b/apps/meteor/client/views/room/components/body/useRetentionPolicy.ts
index 7904f21d45d..f77bc5bf994 100644
--- a/apps/meteor/client/views/room/components/body/useRetentionPolicy.ts
+++ b/apps/meteor/client/views/room/components/body/useRetentionPolicy.ts
@@ -1,4 +1,4 @@
-import { IRoom, IRoomWithRetentionPolicy } from '@rocket.chat/core-typings';
+import type { IRoom, IRoomWithRetentionPolicy } from '@rocket.chat/core-typings';
 import { useSetting } from '@rocket.chat/ui-contexts';
 
 const hasRetentionPolicy = (room: IRoom & { retention?: any }): room is IRoomWithRetentionPolicy =>
diff --git a/apps/meteor/client/views/room/components/body/useRoomRolesManagement.ts b/apps/meteor/client/views/room/components/body/useRoomRolesManagement.ts
index ad1a939a052..7a8ba6f65fe 100644
--- a/apps/meteor/client/views/room/components/body/useRoomRolesManagement.ts
+++ b/apps/meteor/client/views/room/components/body/useRoomRolesManagement.ts
@@ -1,6 +1,6 @@
-import { IRole, IRoom, ISubscription, IUser } from '@rocket.chat/core-typings';
+import type { IRole, IRoom, ISubscription, IUser } from '@rocket.chat/core-typings';
 import { useMethod, useStream } from '@rocket.chat/ui-contexts';
-import { Mongo } from 'meteor/mongo';
+import type { Mongo } from 'meteor/mongo';
 import { useEffect } from 'react';
 
 import { RoomRoles, ChatMessage } from '../../../../../app/models/client';
diff --git a/apps/meteor/client/views/room/components/body/useUnreadMessages.ts b/apps/meteor/client/views/room/components/body/useUnreadMessages.ts
index 7c4ca98993a..d6fc7ddc400 100644
--- a/apps/meteor/client/views/room/components/body/useUnreadMessages.ts
+++ b/apps/meteor/client/views/room/components/body/useUnreadMessages.ts
@@ -1,5 +1,6 @@
-import { IRoom } from '@rocket.chat/core-typings';
-import { Dispatch, SetStateAction, useCallback, useMemo, useState } from 'react';
+import type { IRoom } from '@rocket.chat/core-typings';
+import type { Dispatch, SetStateAction } from 'react';
+import { useCallback, useMemo, useState } from 'react';
 
 import { RoomManager, RoomHistoryManager } from '../../../../../app/ui-utils/client';
 import { useReactiveValue } from '../../../../hooks/useReactiveValue';
diff --git a/apps/meteor/client/views/room/contexts/ChatContext.ts b/apps/meteor/client/views/room/contexts/ChatContext.ts
index c2d36c8a052..1e2736a6871 100644
--- a/apps/meteor/client/views/room/contexts/ChatContext.ts
+++ b/apps/meteor/client/views/room/contexts/ChatContext.ts
@@ -1,6 +1,6 @@
 import { createContext, useContext } from 'react';
 
-import { ChatAPI } from '../../../lib/chats/ChatAPI';
+import type { ChatAPI } from '../../../lib/chats/ChatAPI';
 
 type ChatContextValue = ChatAPI | undefined;
 
diff --git a/apps/meteor/client/views/room/contexts/MessageContext.ts b/apps/meteor/client/views/room/contexts/MessageContext.ts
index 89fe76217e4..87eda8a7abb 100644
--- a/apps/meteor/client/views/room/contexts/MessageContext.ts
+++ b/apps/meteor/client/views/room/contexts/MessageContext.ts
@@ -1,5 +1,6 @@
-import { IMessage } from '@rocket.chat/core-typings';
-import { createContext, useContext, MouseEvent, UIEvent } from 'react';
+import type { IMessage } from '@rocket.chat/core-typings';
+import type { MouseEvent, UIEvent } from 'react';
+import { createContext, useContext } from 'react';
 
 const openUserCard =
 	(_username: string) =>
diff --git a/apps/meteor/client/views/room/contexts/RoomContext.ts b/apps/meteor/client/views/room/contexts/RoomContext.ts
index f6c55619c0f..e899f87c9bb 100644
--- a/apps/meteor/client/views/room/contexts/RoomContext.ts
+++ b/apps/meteor/client/views/room/contexts/RoomContext.ts
@@ -1,4 +1,5 @@
-import { IRoom, IOmnichannelRoom, isOmnichannelRoom, isVoipRoom, IVoipRoom, ISubscription } from '@rocket.chat/core-typings';
+import type { IRoom, IOmnichannelRoom, IVoipRoom, ISubscription } from '@rocket.chat/core-typings';
+import { isOmnichannelRoom, isVoipRoom } from '@rocket.chat/core-typings';
 import { createContext, useContext } from 'react';
 
 export type RoomContextValue = {
diff --git a/apps/meteor/client/views/room/contexts/ToolboxContext.ts b/apps/meteor/client/views/room/contexts/ToolboxContext.ts
index 73a9748d9ab..3afab299d00 100644
--- a/apps/meteor/client/views/room/contexts/ToolboxContext.ts
+++ b/apps/meteor/client/views/room/contexts/ToolboxContext.ts
@@ -1,7 +1,8 @@
-import { EventHandlerOf } from '@rocket.chat/emitter';
+import type { EventHandlerOf } from '@rocket.chat/emitter';
 import { createContext, useContext } from 'react';
 
-import { actions, listen, ToolboxActionConfig, ToolboxAction, Events } from '../lib/Toolbox';
+import type { ToolboxActionConfig, ToolboxAction, Events } from '../lib/Toolbox';
+import { actions, listen } from '../lib/Toolbox';
 import '../lib/Toolbox/defaultActions';
 
 export type ToolboxEventHandler = (handler: EventHandlerOf<Events, 'change'>) => () => void;
diff --git a/apps/meteor/client/views/room/contextualBar/Apps/Apps.tsx b/apps/meteor/client/views/room/contextualBar/Apps/Apps.tsx
index 1ba1372eef6..26f9903583c 100644
--- a/apps/meteor/client/views/room/contextualBar/Apps/Apps.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Apps/Apps.tsx
@@ -1,7 +1,7 @@
-import { IUIKitSurface } from '@rocket.chat/apps-engine/definition/uikit';
+import type { IUIKitSurface } from '@rocket.chat/apps-engine/definition/uikit';
 import { ButtonGroup, Button, Box, Avatar } from '@rocket.chat/fuselage';
 import { UiKitComponent, UiKitModal } from '@rocket.chat/fuselage-ui-kit';
-import { LayoutBlock } from '@rocket.chat/ui-kit';
+import type { LayoutBlock } from '@rocket.chat/ui-kit';
 import React from 'react';
 
 import { getURL } from '../../../../../app/utils/lib/getURL';
diff --git a/apps/meteor/client/views/room/contextualBar/Apps/AppsWithData.tsx b/apps/meteor/client/views/room/contextualBar/Apps/AppsWithData.tsx
index 1cf6c4e50ac..399248db683 100644
--- a/apps/meteor/client/views/room/contextualBar/Apps/AppsWithData.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Apps/AppsWithData.tsx
@@ -1,4 +1,4 @@
-import {
+import type {
 	IUIKitContextualBarInteraction,
 	IUIKitErrorInteraction,
 	IUIKitSurface,
@@ -7,12 +7,13 @@ import {
 	IBlock,
 	IBlockElement,
 	IActionsBlock,
-	InputElementDispatchAction,
 } from '@rocket.chat/apps-engine/definition/uikit';
+import { InputElementDispatchAction } from '@rocket.chat/apps-engine/definition/uikit';
 import { UIKitIncomingInteractionContainerType } from '@rocket.chat/apps-engine/definition/uikit/UIKitIncomingInteractionContainer';
 import { useDebouncedCallback, useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { kitContext } from '@rocket.chat/fuselage-ui-kit';
-import React, { memo, useState, useEffect, useReducer, Dispatch, SyntheticEvent, ContextType } from 'react';
+import type { Dispatch, SyntheticEvent, ContextType } from 'react';
+import React, { memo, useState, useEffect, useReducer } from 'react';
 
 import { triggerBlockAction, triggerCancel, triggerSubmitView, on, off } from '../../../../../app/ui-message/client/ActionManager';
 import { useTabBarClose } from '../../contexts/ToolboxContext';
diff --git a/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslate.stories.tsx b/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslate.stories.tsx
index 06d989d3f3a..c36837ca257 100644
--- a/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslate.stories.tsx
+++ b/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslate.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import VerticalBar from '../../../../components/VerticalBar';
diff --git a/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslate.tsx b/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslate.tsx
index e3c5b743c7d..78060f57a52 100644
--- a/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslate.tsx
+++ b/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslate.tsx
@@ -1,7 +1,8 @@
 import { FieldGroup, Field, ToggleSwitch, Select } from '@rocket.chat/fuselage';
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, ChangeEvent } from 'react';
+import type { ReactElement, ChangeEvent } from 'react';
+import React from 'react';
 
 import VerticalBar from '../../../../components/VerticalBar';
 
diff --git a/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslateWithData.tsx b/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslateWithData.tsx
index a08a154515d..6b5498dfbcb 100644
--- a/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslateWithData.tsx
+++ b/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslateWithData.tsx
@@ -1,7 +1,8 @@
-import { IRoom } from '@rocket.chat/core-typings';
+import type { IRoom } from '@rocket.chat/core-typings';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useUserSubscription, useLanguage } from '@rocket.chat/ui-contexts';
-import React, { useMemo, useEffect, useState, memo, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo, useEffect, useState, memo } from 'react';
 
 import { useEndpointActionExperimental } from '../../../../hooks/useEndpointActionExperimental';
 import { useEndpointData } from '../../../../hooks/useEndpointData';
diff --git a/apps/meteor/client/views/room/contextualBar/Discussions/useDiscussionsList.ts b/apps/meteor/client/views/room/contextualBar/Discussions/useDiscussionsList.ts
index 5e5837da096..5a3e229ec0c 100644
--- a/apps/meteor/client/views/room/contextualBar/Discussions/useDiscussionsList.ts
+++ b/apps/meteor/client/views/room/contextualBar/Discussions/useDiscussionsList.ts
@@ -4,7 +4,8 @@ import { useCallback, useMemo } from 'react';
 
 import { useScrollableMessageList } from '../../../../hooks/lists/useScrollableMessageList';
 import { useStreamUpdatesForMessageList } from '../../../../hooks/lists/useStreamUpdatesForMessageList';
-import { DiscussionsList, DiscussionsListOptions } from '../../../../lib/lists/DiscussionsList';
+import type { DiscussionsListOptions } from '../../../../lib/lists/DiscussionsList';
+import { DiscussionsList } from '../../../../lib/lists/DiscussionsList';
 import { getConfig } from '../../../../lib/utils/getConfig';
 
 export const useDiscussionsList = (
diff --git a/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.stories.tsx b/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.stories.tsx
index fe430daccb9..a280db56df8 100644
--- a/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.stories.tsx
+++ b/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import VerticalBar from '../../../../components/VerticalBar/VerticalBar';
diff --git a/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.tsx b/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.tsx
index 4f2be9676f3..9f1911426d0 100644
--- a/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.tsx
+++ b/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.tsx
@@ -1,7 +1,9 @@
-import { IRoom } from '@rocket.chat/core-typings';
-import { Field, Select, FieldGroup, SelectOption } from '@rocket.chat/fuselage';
+import type { IRoom } from '@rocket.chat/core-typings';
+import type { SelectOption } from '@rocket.chat/fuselage';
+import { Field, Select, FieldGroup } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useState, useMemo, FC } from 'react';
+import type { FC } from 'react';
+import React, { useState, useMemo } from 'react';
 
 import VerticalBar from '../../../../components/VerticalBar';
 import { useTabBarClose } from '../../contexts/ToolboxContext';
diff --git a/apps/meteor/client/views/room/contextualBar/ExportMessages/FileExport.tsx b/apps/meteor/client/views/room/contextualBar/ExportMessages/FileExport.tsx
index b1177a606aa..e5b164bd9f8 100644
--- a/apps/meteor/client/views/room/contextualBar/ExportMessages/FileExport.tsx
+++ b/apps/meteor/client/views/room/contextualBar/ExportMessages/FileExport.tsx
@@ -1,7 +1,9 @@
-import { IRoom } from '@rocket.chat/core-typings';
-import { Field, Select, ButtonGroup, Button, FieldGroup, SelectOption, InputBox } from '@rocket.chat/fuselage';
+import type { IRoom } from '@rocket.chat/core-typings';
+import type { SelectOption } from '@rocket.chat/fuselage';
+import { Field, Select, ButtonGroup, Button, FieldGroup, InputBox } from '@rocket.chat/fuselage';
 import { useToastMessageDispatch, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, MouseEventHandler, useMemo } from 'react';
+import type { FC, MouseEventHandler } from 'react';
+import React, { useMemo } from 'react';
 
 import { useForm } from '../../../../hooks/useForm';
 
diff --git a/apps/meteor/client/views/room/contextualBar/ExportMessages/MailExportForm.tsx b/apps/meteor/client/views/room/contextualBar/ExportMessages/MailExportForm.tsx
index eb94a734dff..ab3e119cb26 100644
--- a/apps/meteor/client/views/room/contextualBar/ExportMessages/MailExportForm.tsx
+++ b/apps/meteor/client/views/room/contextualBar/ExportMessages/MailExportForm.tsx
@@ -1,9 +1,10 @@
-import { IRoom, IUser } from '@rocket.chat/core-typings';
+import type { IRoom, IUser } from '@rocket.chat/core-typings';
 import { css } from '@rocket.chat/css-in-js';
 import { Field, TextInput, ButtonGroup, Button, Box, Icon, Callout, FieldGroup } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useToastMessageDispatch, useUserRoom, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useState, useEffect, useContext, FC, MouseEventHandler } from 'react';
+import type { FC, MouseEventHandler } from 'react';
+import React, { useState, useEffect, useContext } from 'react';
 
 import { validateEmail } from '../../../../../lib/emailValidator';
 import UserAutoCompleteMultiple from '../../../../components/UserAutoCompleteMultiple';
diff --git a/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.stories.tsx b/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.stories.tsx
index d34bb7c38c8..6557955a4a9 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.stories.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import VerticalBar from '../../../../../components/VerticalBar';
diff --git a/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcutSection.tsx b/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcutSection.tsx
index 29ebdf68db6..b90968d58b5 100644
--- a/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcutSection.tsx
+++ b/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcutSection.tsx
@@ -1,5 +1,6 @@
 import { Box, Divider } from '@rocket.chat/fuselage';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 type KeyboardShortcutSectionProps = {
 	title: string;
diff --git a/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.stories.tsx b/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.stories.tsx
index 5ed77d36f85..c0dfe69c07b 100644
--- a/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.stories.tsx
+++ b/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import VerticalBar from '../../../../components/VerticalBar';
diff --git a/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.tsx b/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.tsx
index 500becc4876..d2ad1359235 100644
--- a/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.tsx
+++ b/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.tsx
@@ -1,5 +1,6 @@
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { memo, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { memo } from 'react';
 
 import VerticalBar from '../../../../components/VerticalBar';
 import KeyboardShortcutSection from './KeyboardShortcutSection';
diff --git a/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcutsWithData.tsx b/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcutsWithData.tsx
index ffa8c022c5c..c35baf4933b 100644
--- a/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcutsWithData.tsx
+++ b/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcutsWithData.tsx
@@ -1,7 +1,8 @@
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
-import { ToolboxContextValue } from '../../contexts/ToolboxContext';
+import type { ToolboxContextValue } from '../../contexts/ToolboxContext';
 import KeyboardShortcuts from './KeyboardShortcuts';
 
 const KeyboardShortcutsWithData = ({ tabBar }: { tabBar: ToolboxContextValue['tabBar'] }): ReactElement => {
diff --git a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.stories.tsx b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.stories.tsx
index f357aeab244..df7274bcb67 100644
--- a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.stories.tsx
+++ b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.stories.tsx
@@ -1,5 +1,5 @@
 import { action } from '@storybook/addon-actions';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import VerticalBar from '../../../../components/VerticalBar';
diff --git a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.tsx b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.tsx
index d5b960d9f24..5d5524d9147 100644
--- a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.tsx
+++ b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.tsx
@@ -1,9 +1,10 @@
 import { Button, ButtonGroup, FieldGroup, IconButton } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import VerticalBar from '../../../../components/VerticalBar';
-import { NotificationFormValues } from './NotificationPreferencesWithData';
+import type { NotificationFormValues } from './NotificationPreferencesWithData';
 import NotificationByDevice from './components/NotificationByDevice';
 import NotificationToogle from './components/NotificationToogle';
 import { Preferences } from './components/Preferences';
diff --git a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferencesWithData.tsx b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferencesWithData.tsx
index 1ab4274ab86..b2cd71518c2 100644
--- a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferencesWithData.tsx
+++ b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferencesWithData.tsx
@@ -1,6 +1,7 @@
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useCustomSound, useUserSubscription, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { memo, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { memo } from 'react';
 
 import { useEndpointActionExperimental } from '../../../../hooks/useEndpointActionExperimental';
 import { useForm } from '../../../../hooks/useForm';
diff --git a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/components/NotificationByDevice.tsx b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/components/NotificationByDevice.tsx
index 336152a9ca6..7746aae6727 100644
--- a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/components/NotificationByDevice.tsx
+++ b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/components/NotificationByDevice.tsx
@@ -1,5 +1,6 @@
 import { Box, Accordion, Icon, FieldGroup } from '@rocket.chat/fuselage';
-import React, { ComponentProps, memo, ReactElement, ReactNode } from 'react';
+import type { ComponentProps, ReactElement, ReactNode } from 'react';
+import React, { memo } from 'react';
 
 type NotificationByDeviceProps = {
 	device: string;
diff --git a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/components/NotificationToogle.tsx b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/components/NotificationToogle.tsx
index cda4ca09986..8f8de4feec7 100644
--- a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/components/NotificationToogle.tsx
+++ b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/components/NotificationToogle.tsx
@@ -1,6 +1,7 @@
 import { Box, Field, FieldGroup, ToggleSwitch } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
-import React, { memo, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { memo } from 'react';
 
 type NotificationToogleProps = {
 	label: string;
diff --git a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/components/Preferences.tsx b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/components/Preferences.tsx
index f1f892bcd4e..7f8364c9026 100644
--- a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/components/Preferences.tsx
+++ b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/components/Preferences.tsx
@@ -1,5 +1,6 @@
 import { Field, Select } from '@rocket.chat/fuselage';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 type PreferencesProps = {
 	id: string;
diff --git a/apps/meteor/client/views/room/contextualBar/OTR/OTR.stories.tsx b/apps/meteor/client/views/room/contextualBar/OTR/OTR.stories.tsx
index 3d63def00b0..d8d0dd34c4f 100644
--- a/apps/meteor/client/views/room/contextualBar/OTR/OTR.stories.tsx
+++ b/apps/meteor/client/views/room/contextualBar/OTR/OTR.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import { OtrRoomState } from '../../../../../app/otr/lib/OtrRoomState';
diff --git a/apps/meteor/client/views/room/contextualBar/OTR/OTR.tsx b/apps/meteor/client/views/room/contextualBar/OTR/OTR.tsx
index e54da2577b6..dc138cfeacd 100644
--- a/apps/meteor/client/views/room/contextualBar/OTR/OTR.tsx
+++ b/apps/meteor/client/views/room/contextualBar/OTR/OTR.tsx
@@ -1,7 +1,8 @@
 import type { IUser } from '@rocket.chat/core-typings';
 import { Box, Button, Throbber } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { MouseEventHandler, ReactElement } from 'react';
+import type { MouseEventHandler, ReactElement } from 'react';
+import React from 'react';
 
 import { OtrRoomState } from '../../../../../app/otr/lib/OtrRoomState';
 import VerticalBar from '../../../../components/VerticalBar';
diff --git a/apps/meteor/client/views/room/contextualBar/OTR/OTRWithData.tsx b/apps/meteor/client/views/room/contextualBar/OTR/OTRWithData.tsx
index f7a1f64c548..b5763d77af8 100644
--- a/apps/meteor/client/views/room/contextualBar/OTR/OTRWithData.tsx
+++ b/apps/meteor/client/views/room/contextualBar/OTR/OTRWithData.tsx
@@ -1,5 +1,6 @@
-import { IRoom } from '@rocket.chat/core-typings';
-import React, { ReactElement, useCallback, useEffect, useMemo } from 'react';
+import type { IRoom } from '@rocket.chat/core-typings';
+import type { ReactElement } from 'react';
+import React, { useCallback, useEffect, useMemo } from 'react';
 
 import ORTInstance from '../../../../../app/otr/client/OTR';
 import { OtrRoomState } from '../../../../../app/otr/lib/OtrRoomState';
diff --git a/apps/meteor/client/views/room/contextualBar/OTR/components/OTREstablished.tsx b/apps/meteor/client/views/room/contextualBar/OTR/components/OTREstablished.tsx
index 02da786855e..e74dbb5c54f 100644
--- a/apps/meteor/client/views/room/contextualBar/OTR/components/OTREstablished.tsx
+++ b/apps/meteor/client/views/room/contextualBar/OTR/components/OTREstablished.tsx
@@ -1,6 +1,7 @@
 import { Button, ButtonGroup } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 type OTREstablishedProps = {
 	onClickRefresh: () => void;
diff --git a/apps/meteor/client/views/room/contextualBar/OTR/components/OTRStates.tsx b/apps/meteor/client/views/room/contextualBar/OTR/components/OTRStates.tsx
index 448c5dab26b..e8db458ea32 100644
--- a/apps/meteor/client/views/room/contextualBar/OTR/components/OTRStates.tsx
+++ b/apps/meteor/client/views/room/contextualBar/OTR/components/OTRStates.tsx
@@ -1,6 +1,8 @@
-import { Icon, States, StatesAction, StatesActions, StatesIcon, StatesSubtitle, StatesTitle } from '@rocket.chat/fuselage';
+import type { Icon } from '@rocket.chat/fuselage';
+import { States, StatesAction, StatesActions, StatesIcon, StatesSubtitle, StatesTitle } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, ComponentProps } from 'react';
+import type { ReactElement, ComponentProps } from 'react';
+import React from 'react';
 
 type OTRStatesProps = {
 	title: string;
diff --git a/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.stories.tsx b/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.stories.tsx
index 557baddcb9c..d74711ec867 100644
--- a/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.stories.tsx
+++ b/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import VerticalBar from '../../../../components/VerticalBar';
diff --git a/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.tsx b/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.tsx
index acb6a59b5e7..1ef76603413 100644
--- a/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.tsx
+++ b/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.tsx
@@ -1,13 +1,14 @@
-import { IUser } from '@rocket.chat/core-typings';
+import type { IUser } from '@rocket.chat/core-typings';
 import { Field, ButtonGroup, Button, CheckBox, Callout } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import UserAutoCompleteMultiple from '../../../../components/UserAutoCompleteMultiple';
 import VerticalBar from '../../../../components/VerticalBar';
 import PruneMessagesDateTimeRow from './PruneMessagesDateTimeRow';
-import { initialValues } from './PruneMessagesWithData';
+import type { initialValues } from './PruneMessagesWithData';
 
 type PruneMessagesProps = {
 	callOutText?: string;
diff --git a/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessagesDateTimeRow.tsx b/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessagesDateTimeRow.tsx
index 464aa82f046..bfb48f2859c 100644
--- a/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessagesDateTimeRow.tsx
+++ b/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessagesDateTimeRow.tsx
@@ -1,5 +1,6 @@
 import { Field, InputBox, Box, Margins } from '@rocket.chat/fuselage';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 type PruneMessagesDateTimeRowProps = {
 	label: string;
diff --git a/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessagesWithData.tsx b/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessagesWithData.tsx
index 7a96680bad2..ce408971979 100644
--- a/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessagesWithData.tsx
+++ b/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessagesWithData.tsx
@@ -1,12 +1,14 @@
-import { IRoom, IUser, isDirectMessageRoom } from '@rocket.chat/core-typings';
+import type { IRoom, IUser } from '@rocket.chat/core-typings';
+import { isDirectMessageRoom } from '@rocket.chat/core-typings';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useSetModal, useToastMessageDispatch, useUserRoom, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
-import React, { useCallback, useEffect, useState, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 
 import GenericModal from '../../../../components/GenericModal';
 import { useForm } from '../../../../hooks/useForm';
-import { ToolboxContextValue } from '../../contexts/ToolboxContext';
+import type { ToolboxContextValue } from '../../contexts/ToolboxContext';
 import PruneMessages from './PruneMessages';
 
 const getTimeZoneOffset = (): string => {
diff --git a/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.stories.tsx b/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.stories.tsx
index f952ae8a056..e744e93c72a 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.stories.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.stories.tsx
@@ -1,5 +1,5 @@
 import { action } from '@storybook/addon-actions';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import VerticalBar from '../../../../components/VerticalBar';
diff --git a/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItem.stories.tsx b/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItem.stories.tsx
index 8c3478b8ce9..555acb5bf8b 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItem.stories.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItem.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import VerticalBar from '../../../../../components/VerticalBar';
diff --git a/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItemIcon.stories.tsx b/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItemIcon.stories.tsx
index 76217d40f91..3c7895e8d5c 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItemIcon.stories.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItemIcon.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import FileItemIcon from './FileItemIcon';
diff --git a/apps/meteor/client/views/room/contextualBar/RoomFiles/hooks/useFilesList.ts b/apps/meteor/client/views/room/contextualBar/RoomFiles/hooks/useFilesList.ts
index fe43a86d5e1..38c6a87ef28 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomFiles/hooks/useFilesList.ts
+++ b/apps/meteor/client/views/room/contextualBar/RoomFiles/hooks/useFilesList.ts
@@ -4,8 +4,9 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useScrollableRecordList } from '../../../../../hooks/lists/useScrollableRecordList';
 import { useStreamUpdatesForMessageList } from '../../../../../hooks/lists/useStreamUpdatesForMessageList';
 import { useComponentDidUpdate } from '../../../../../hooks/useComponentDidUpdate';
-import { FilesList, FilesListOptions } from '../../../../../lib/lists/FilesList';
-import { MessageList } from '../../../../../lib/lists/MessageList';
+import type { FilesListOptions } from '../../../../../lib/lists/FilesList';
+import { FilesList } from '../../../../../lib/lists/FilesList';
+import type { MessageList } from '../../../../../lib/lists/MessageList';
 import { getConfig } from '../../../../../lib/utils/getConfig';
 
 export const useFilesList = (
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.stories.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.stories.tsx
index e45f0f55158..60d0e5dc135 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.stories.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import VerticalBar from '../../../../../components/VerticalBar';
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.tsx
index 5c2bd17f84d..a25a78e4a7b 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.tsx
@@ -1,7 +1,8 @@
-import { IUser } from '@rocket.chat/core-typings';
+import type { IUser } from '@rocket.chat/core-typings';
 import { Field, Button, ButtonGroup, FieldGroup } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import UserAutoCompleteMultiple from '../../../../../components/UserAutoCompleteMultiple';
 import UserAutoCompleteMultipleFederated from '../../../../../components/UserAutoCompleteMultiple/UserAutoCompleteMultipleFederated';
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsersWithData.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsersWithData.tsx
index 789d8387fe7..6b1403b0d80 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsersWithData.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsersWithData.tsx
@@ -1,7 +1,9 @@
-import { IRoom, isRoomFederated, IUser } from '@rocket.chat/core-typings';
+import type { IRoom, IUser } from '@rocket.chat/core-typings';
+import { isRoomFederated } from '@rocket.chat/core-typings';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useToastMessageDispatch, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { useForm } from '../../../../../hooks/useForm';
 import { useRoom } from '../../../contexts/RoomContext';
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/EditInviteLink.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/EditInviteLink.tsx
index 6431e6b9e9a..27944d4b932 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/EditInviteLink.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/EditInviteLink.tsx
@@ -1,6 +1,8 @@
-import { Box, Field, Select, Button, SelectOption } from '@rocket.chat/fuselage';
+import type { SelectOption } from '@rocket.chat/fuselage';
+import { Box, Field, Select, Button } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useMemo } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo } from 'react';
 import { useForm, Controller } from 'react-hook-form';
 
 type EditInviteLinkProps = {
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteLink.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteLink.tsx
index 142527c1662..39a0e1e476a 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteLink.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteLink.tsx
@@ -1,6 +1,7 @@
 import { Box, Field, UrlInput, Icon, Button, InputBox } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import useClipboardWithToast from '../../../../../hooks/useClipboardWithToast';
 
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.stories.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.stories.tsx
index d6eaa556dd9..1707a49fcef 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.stories.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import VerticalBar from '../../../../../components/VerticalBar';
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.tsx
index 19ceeb442d6..ca0be3df72b 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.tsx
@@ -1,6 +1,7 @@
 import { Callout } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import VerticalBar from '../../../../../components/VerticalBar';
 import EditInviteLink from './EditInviteLink';
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsersWithData.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsersWithData.tsx
index 6b82b1bacc5..6c04b60ec86 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsersWithData.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsersWithData.tsx
@@ -1,7 +1,8 @@
-import { IRoom } from '@rocket.chat/core-typings';
+import type { IRoom } from '@rocket.chat/core-typings';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useEndpoint, useTranslation, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
-import React, { useState, useEffect, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useState, useEffect } from 'react';
 
 import { useFormatDateAndTime } from '../../../../../hooks/useFormatDateAndTime';
 import { useTabBarClose } from '../../../contexts/ToolboxContext';
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.stories.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.stories.tsx
index 5a3adcfabc8..0e1f9fbc5dc 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.stories.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.stories.tsx
@@ -1,6 +1,6 @@
 import { UserStatus } from '@rocket.chat/core-typings';
 import { action } from '@storybook/addon-actions';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import VerticalBar from '../../../../components/VerticalBar';
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.tsx
index 488a9e69967..8b9f5337888 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.tsx
@@ -1,8 +1,10 @@
-import { IRoom, IUser } from '@rocket.chat/core-typings';
-import { Box, Icon, TextInput, Margins, Select, Throbber, ButtonGroup, Button, Callout, SelectOption } from '@rocket.chat/fuselage';
+import type { IRoom, IUser } from '@rocket.chat/core-typings';
+import type { SelectOption } from '@rocket.chat/fuselage';
+import { Box, Icon, TextInput, Margins, Select, Throbber, ButtonGroup, Button, Callout } from '@rocket.chat/fuselage';
 import { useMutableCallback, useAutoFocus } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useMemo, ReactElement, FormEventHandler, ComponentProps, MouseEvent } from 'react';
+import type { ReactElement, FormEventHandler, ComponentProps, MouseEvent } from 'react';
+import React, { useMemo } from 'react';
 import { Virtuoso } from 'react-virtuoso';
 
 import ScrollableContentWrapper from '../../../../components/ScrollableContentWrapper';
@@ -46,7 +48,7 @@ const RoomMembers = ({
 	total,
 	error,
 	loadMoreItems,
-	renderRow: Row = RoomMembersRow,
+	renderRow: RowComponent = RoomMembersRow,
 	rid,
 	isTeam,
 	isDirect,
@@ -137,7 +139,7 @@ const RoomMembers = ({
 							overscan={50}
 							data={members}
 							components={{ Scroller: ScrollableContentWrapper }}
-							itemContent={(index, data): ReactElement => <Row data={itemData} user={data} index={index} reload={reload} />}
+							itemContent={(index, data): ReactElement => <RowComponent data={itemData} user={data} index={index} reload={reload} />}
 						/>
 					)}
 				</Box>
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersActions.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersActions.tsx
index ce291e7de73..7153496c6d4 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersActions.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersActions.tsx
@@ -1,6 +1,7 @@
-import { IUser, IRoom } from '@rocket.chat/core-typings';
+import type { IUser, IRoom } from '@rocket.chat/core-typings';
 import { Option, Menu } from '@rocket.chat/fuselage';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { useActionSpread } from '../../../hooks/useActionSpread';
 import { useUserInfoActions } from '../../hooks/useUserInfoActions';
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersItem.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersItem.tsx
index fc1b8390be2..3e60c0caf1c 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersItem.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersItem.tsx
@@ -1,4 +1,4 @@
-import { IRoom, IUser } from '@rocket.chat/core-typings';
+import type { IRoom, IUser } from '@rocket.chat/core-typings';
 import {
 	Option,
 	OptionAvatar,
@@ -11,7 +11,8 @@ import {
 	OptionSkeleton,
 } from '@rocket.chat/fuselage';
 import { usePrefersReducedMotion } from '@rocket.chat/fuselage-hooks';
-import React, { ReactElement, useState, MouseEvent } from 'react';
+import type { ReactElement, MouseEvent } from 'react';
+import React, { useState } from 'react';
 
 import { ReactiveUserStatus } from '../../../../components/UserStatus';
 import UserAvatar from '../../../../components/avatar/UserAvatar';
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersRow.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersRow.tsx
index 7782ebf8a7c..76ea1a9c975 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersRow.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersRow.tsx
@@ -1,5 +1,6 @@
-import { IUser, IRoom } from '@rocket.chat/core-typings';
-import React, { memo, MouseEvent, ReactElement } from 'react';
+import type { IUser, IRoom } from '@rocket.chat/core-typings';
+import type { MouseEvent, ReactElement } from 'react';
+import React, { memo } from 'react';
 
 import RoomMembersItem from './RoomMembersItem';
 
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersWithData.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersWithData.tsx
index d4f96f38c32..9cc9242eab7 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersWithData.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersWithData.tsx
@@ -1,7 +1,9 @@
-import { isRoomFederated, IRoom, IUser, isDirectMessageRoom, isTeamRoom } from '@rocket.chat/core-typings';
+import type { IRoom, IUser } from '@rocket.chat/core-typings';
+import { isRoomFederated, isDirectMessageRoom, isTeamRoom } from '@rocket.chat/core-typings';
 import { useMutableCallback, useDebouncedValue, useLocalStorage } from '@rocket.chat/fuselage-hooks';
 import { useUserRoom, useAtLeastOnePermission, useUser, usePermission } from '@rocket.chat/ui-contexts';
-import React, { useCallback, useMemo, useState, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useCallback, useMemo, useState } from 'react';
 
 import { useRecordList } from '../../../../hooks/lists/useRecordList';
 import { AsyncStatePhase } from '../../../../hooks/useAsyncState';
diff --git a/apps/meteor/client/views/room/contextualBar/Threads/ThreadList.tsx b/apps/meteor/client/views/room/contextualBar/Threads/ThreadList.tsx
index 521390bfbd2..ef725117347 100644
--- a/apps/meteor/client/views/room/contextualBar/Threads/ThreadList.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Threads/ThreadList.tsx
@@ -9,7 +9,8 @@ import {
 	useTranslation,
 	useUserSubscription,
 } from '@rocket.chat/ui-contexts';
-import React, { FC, useMemo } from 'react';
+import type { FC } from 'react';
+import React, { useMemo } from 'react';
 import { Virtuoso } from 'react-virtuoso';
 
 import ScrollableContentWrapper from '../../../../components/ScrollableContentWrapper';
diff --git a/apps/meteor/client/views/room/contextualBar/Threads/ThreadRow.tsx b/apps/meteor/client/views/room/contextualBar/Threads/ThreadRow.tsx
index e284e4681b2..e7447dd0857 100644
--- a/apps/meteor/client/views/room/contextualBar/Threads/ThreadRow.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Threads/ThreadRow.tsx
@@ -1,5 +1,6 @@
 import type { IMessage } from '@rocket.chat/core-typings';
-import React, { memo, MouseEvent, ReactElement } from 'react';
+import type { MouseEvent, ReactElement } from 'react';
+import React, { memo } from 'react';
 
 import { useDecryptedMessage } from '../../../../hooks/useDecryptedMessage';
 import { clickableItem } from '../../../../lib/clickableItem';
diff --git a/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadListMessage.tsx b/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadListMessage.tsx
index 5cd2d2b4de1..a0ca193f0e2 100644
--- a/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadListMessage.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadListMessage.tsx
@@ -1,7 +1,8 @@
-import { IMessage } from '@rocket.chat/core-typings';
+import type { IMessage } from '@rocket.chat/core-typings';
 import { Message, Box, IconButton } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ComponentProps, memo, MouseEventHandler, ReactElement, ReactNode } from 'react';
+import type { ComponentProps, MouseEventHandler, ReactElement, ReactNode } from 'react';
+import React, { memo } from 'react';
 
 import RawText from '../../../../../components/RawText';
 import UserAvatar from '../../../../../components/avatar/UserAvatar';
diff --git a/apps/meteor/client/views/room/contextualBar/Threads/useThreadsList.ts b/apps/meteor/client/views/room/contextualBar/Threads/useThreadsList.ts
index 5477e009187..81211a6ec6e 100644
--- a/apps/meteor/client/views/room/contextualBar/Threads/useThreadsList.ts
+++ b/apps/meteor/client/views/room/contextualBar/Threads/useThreadsList.ts
@@ -4,7 +4,8 @@ import { useCallback, useMemo } from 'react';
 
 import { useScrollableMessageList } from '../../../../hooks/lists/useScrollableMessageList';
 import { useStreamUpdatesForMessageList } from '../../../../hooks/lists/useStreamUpdatesForMessageList';
-import { ThreadsList, ThreadsListOptions } from '../../../../lib/lists/ThreadsList';
+import type { ThreadsListOptions } from '../../../../lib/lists/ThreadsList';
+import { ThreadsList } from '../../../../lib/lists/ThreadsList';
 import { getConfig } from '../../../../lib/utils/getConfig';
 
 export const useThreadsList = (
diff --git a/apps/meteor/client/views/room/contextualBar/Threads/withData.tsx b/apps/meteor/client/views/room/contextualBar/Threads/withData.tsx
index 625f0f7ab77..aa380b41c82 100644
--- a/apps/meteor/client/views/room/contextualBar/Threads/withData.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Threads/withData.tsx
@@ -1,12 +1,13 @@
 import { useDebouncedValue, useLocalStorage } from '@rocket.chat/fuselage-hooks';
 import { useUserId, useUserSubscription, useUserRoom } from '@rocket.chat/ui-contexts';
-import React, { FC, useCallback, useMemo, useState } from 'react';
+import type { FC } from 'react';
+import React, { useCallback, useMemo, useState } from 'react';
 
 import { useRecordList } from '../../../../hooks/lists/useRecordList';
 import { AsyncStatePhase } from '../../../../hooks/useAsyncState';
-import { ThreadsListOptions } from '../../../../lib/lists/ThreadsList';
+import type { ThreadsListOptions } from '../../../../lib/lists/ThreadsList';
 import { useTabBarClose } from '../../contexts/ToolboxContext';
-import { ThreadListProps } from './ThreadList';
+import type { ThreadListProps } from './ThreadList';
 import { useThreadsList } from './useThreadsList';
 
 const subscriptionFields = { tunread: true, tunreadUser: true, tunreadGroup: true };
diff --git a/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoActions.tsx b/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoActions.tsx
index 439f5ca15a4..ce0ca3e2ff0 100644
--- a/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoActions.tsx
+++ b/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoActions.tsx
@@ -1,6 +1,7 @@
-import { IRoom, IUser } from '@rocket.chat/core-typings';
+import type { IRoom, IUser } from '@rocket.chat/core-typings';
 import { ButtonGroup, Menu, Option } from '@rocket.chat/fuselage';
-import React, { useMemo, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo } from 'react';
 
 import UserInfo from '../../../../components/UserInfo';
 import { useActionSpread } from '../../../hooks/useActionSpread';
diff --git a/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoWithData.tsx b/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoWithData.tsx
index a48a7240bd6..41c2ac6dc93 100644
--- a/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoWithData.tsx
+++ b/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoWithData.tsx
@@ -1,7 +1,8 @@
-import { IUser, IRoom } from '@rocket.chat/core-typings';
+import type { IUser, IRoom } from '@rocket.chat/core-typings';
 import { Callout } from '@rocket.chat/fuselage';
 import { useRolesDescription, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useMemo, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo } from 'react';
 
 import { getUserEmailAddress } from '../../../../../lib/getUserEmailAddress';
 import { FormSkeleton } from '../../../../components/Skeleton';
diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfBlockModal.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfBlockModal.tsx
index 4114c00b8dc..c1c5f78bee2 100644
--- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfBlockModal.tsx
+++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfBlockModal.tsx
@@ -1,6 +1,7 @@
 import { Box, Icon } from '@rocket.chat/fuselage';
 import { useTranslation, useSetting } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import GenericModal from '../../../../components/GenericModal';
 
diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfConfigModal.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfConfigModal.tsx
index af49bc5c07e..41cb74c4b28 100644
--- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfConfigModal.tsx
+++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfConfigModal.tsx
@@ -1,6 +1,7 @@
 import { Modal, Button, Box, Callout, Margins } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 type VideoConfConfigModalProps = {
 	onClose: () => void;
diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfList.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfList.tsx
index 6953a101f04..8cdb21c8c4a 100644
--- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfList.tsx
+++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfList.tsx
@@ -1,8 +1,9 @@
-import { IGroupVideoConference } from '@rocket.chat/core-typings';
+import type { IGroupVideoConference } from '@rocket.chat/core-typings';
 import { Box, States, StatesIcon, StatesTitle, StatesSubtitle } from '@rocket.chat/fuselage';
 import { useResizeObserver } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 import { Virtuoso } from 'react-virtuoso';
 
 import ScrollableContentWrapper from '../../../../../components/ScrollableContentWrapper';
diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfListItem.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfListItem.tsx
index 189a53d7ad2..c904ec7803e 100644
--- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfListItem.tsx
+++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfListItem.tsx
@@ -1,9 +1,10 @@
-import { IGroupVideoConference } from '@rocket.chat/core-typings';
+import type { IGroupVideoConference } from '@rocket.chat/core-typings';
 import { css } from '@rocket.chat/css-in-js';
 import { Button, Message, Box, Avatar, Palette } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useTranslation, useSetting } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import UserAvatar from '../../../../../components/avatar/UserAvatar';
 import { useVideoConfJoinCall } from '../../../../../contexts/VideoConfContext';
diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfListWithData.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfListWithData.tsx
index 76592499076..fbabc97f0e0 100644
--- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfListWithData.tsx
+++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfListWithData.tsx
@@ -1,5 +1,6 @@
-import { IRoom } from '@rocket.chat/core-typings';
-import React, { ReactElement, useMemo } from 'react';
+import type { IRoom } from '@rocket.chat/core-typings';
+import type { ReactElement } from 'react';
+import React, { useMemo } from 'react';
 
 import { useRecordList } from '../../../../../hooks/lists/useRecordList';
 import { AsyncStatePhase } from '../../../../../hooks/useAsyncState';
diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/IncomingPopup.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/IncomingPopup.tsx
index 1139a9cf44f..3d364fd9bb3 100644
--- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/IncomingPopup.tsx
+++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/IncomingPopup.tsx
@@ -1,4 +1,4 @@
-import { IRoom } from '@rocket.chat/core-typings';
+import type { IRoom } from '@rocket.chat/core-typings';
 import { Skeleton } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
@@ -14,7 +14,8 @@ import {
 	VideoConfPopupTitle,
 	VideoConfPopupHeader,
 } from '@rocket.chat/ui-video-conf';
-import React, { ReactElement, useMemo } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo } from 'react';
 
 import { useVideoConfSetPreferences } from '../../../../../../contexts/VideoConfContext';
 import { AsyncStatePhase } from '../../../../../../hooks/useAsyncState';
diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/OutgoingPopup.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/OutgoingPopup.tsx
index faab0e688e0..92f30c0c1ce 100644
--- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/OutgoingPopup.tsx
+++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/OutgoingPopup.tsx
@@ -1,4 +1,4 @@
-import { IRoom } from '@rocket.chat/core-typings';
+import type { IRoom } from '@rocket.chat/core-typings';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import {
 	VideoConfPopup,
@@ -12,7 +12,8 @@ import {
 	VideoConfPopupTitle,
 	VideoConfPopupHeader,
 } from '@rocket.chat/ui-video-conf';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { useVideoConfCapabilities, useVideoConfPreferences } from '../../../../../../contexts/VideoConfContext';
 import VideoConfPopupRoomInfo from './VideoConfPopupRoomInfo';
diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/StartCallPopup.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/StartCallPopup.tsx
index 5b372fc17f9..7a2a3120a25 100644
--- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/StartCallPopup.tsx
+++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/StartCallPopup.tsx
@@ -1,4 +1,4 @@
-import { IRoom } from '@rocket.chat/core-typings';
+import type { IRoom } from '@rocket.chat/core-typings';
 import { useOutsideClick, useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import {
@@ -13,12 +13,13 @@ import {
 	VideoConfPopupTitle,
 	VideoConfPopupFooterButtons,
 } from '@rocket.chat/ui-video-conf';
-import React, { ReactElement, useRef } from 'react';
+import type { ReactElement } from 'react';
+import React, { useRef } from 'react';
 
 import { useVideoConfSetPreferences, useVideoConfCapabilities, useVideoConfPreferences } from '../../../../../../contexts/VideoConfContext';
 import VideoConfPopupRoomInfo from './VideoConfPopupRoomInfo';
 
-type StartCallPopup = {
+type StartCallPopupProps = {
 	id: string;
 	room: IRoom;
 	onClose: () => void;
@@ -26,7 +27,7 @@ type StartCallPopup = {
 	loading: boolean;
 };
 
-const StartCallPopup = ({ loading, room, onClose, onConfirm }: StartCallPopup): ReactElement => {
+const StartCallPopup = ({ loading, room, onClose, onConfirm }: StartCallPopupProps): ReactElement => {
 	const ref = useRef<HTMLDivElement>(null);
 	useOutsideClick([ref], !loading ? onClose : (): void => undefined);
 
diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/TimedVideoConfPopup.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/TimedVideoConfPopup.tsx
index 41b698b70b0..c6bfaa8d1e7 100644
--- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/TimedVideoConfPopup.tsx
+++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/TimedVideoConfPopup.tsx
@@ -1,6 +1,7 @@
-import { IRoom } from '@rocket.chat/core-typings';
+import type { IRoom } from '@rocket.chat/core-typings';
 import { useUserRoom } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useState } from 'react';
+import type { ReactElement } from 'react';
+import React, { useState } from 'react';
 
 import {
 	useVideoConfAcceptCall,
diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/VideoConfPopupRoomInfo.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/VideoConfPopupRoomInfo.tsx
index 4dac91e88e2..e8a7160e07e 100644
--- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/VideoConfPopupRoomInfo.tsx
+++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/VideoConfPopupRoomInfo.tsx
@@ -1,7 +1,9 @@
-import { IRoom, isDirectMessageRoom, isMultipleDirectMessageRoom } from '@rocket.chat/core-typings';
+import type { IRoom } from '@rocket.chat/core-typings';
+import { isDirectMessageRoom, isMultipleDirectMessageRoom } from '@rocket.chat/core-typings';
 import { useUser, useUserSubscription } from '@rocket.chat/ui-contexts';
 import { VideoConfPopupInfo } from '@rocket.chat/ui-video-conf';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { RoomIcon } from '../../../../../../components/RoomIcon';
 import ReactiveUserStatus from '../../../../../../components/UserStatus/ReactiveUserStatus';
diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopups.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopups.tsx
index 559cc1e4282..74ab58588a0 100644
--- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopups.tsx
+++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopups.tsx
@@ -1,13 +1,10 @@
 import { useCustomSound } from '@rocket.chat/ui-contexts';
 import { VideoConfPopupBackdrop } from '@rocket.chat/ui-video-conf';
-import React, { ReactElement, useEffect, useMemo } from 'react';
-
-import {
-	VideoConfPopupPayload,
-	useVideoConfIsCalling,
-	useVideoConfIsRinging,
-	useVideoConfIncomingCalls,
-} from '../../../../../contexts/VideoConfContext';
+import type { ReactElement } from 'react';
+import React, { useEffect, useMemo } from 'react';
+
+import type { VideoConfPopupPayload } from '../../../../../contexts/VideoConfContext';
+import { useVideoConfIsCalling, useVideoConfIsRinging, useVideoConfIncomingCalls } from '../../../../../contexts/VideoConfContext';
 import VideoConfPopupPortal from '../../../../../portals/VideoConfPopupPortal';
 import VideoConfPopup from './VideoConfPopup';
 
diff --git a/apps/meteor/client/views/room/hooks/useAppsContextualBar.ts b/apps/meteor/client/views/room/hooks/useAppsContextualBar.ts
index 07316501f5d..b1c84472290 100644
--- a/apps/meteor/client/views/room/hooks/useAppsContextualBar.ts
+++ b/apps/meteor/client/views/room/hooks/useAppsContextualBar.ts
@@ -1,4 +1,4 @@
-import { IUIKitContextualBarInteraction } from '@rocket.chat/apps-engine/definition/uikit';
+import type { IUIKitContextualBarInteraction } from '@rocket.chat/apps-engine/definition/uikit';
 import { useCurrentRoute } from '@rocket.chat/ui-contexts';
 import { useEffect, useState } from 'react';
 
diff --git a/apps/meteor/client/views/room/hooks/useIsVisible.ts b/apps/meteor/client/views/room/hooks/useIsVisible.ts
index 10310ad556f..f350ab740e5 100644
--- a/apps/meteor/client/views/room/hooks/useIsVisible.ts
+++ b/apps/meteor/client/views/room/hooks/useIsVisible.ts
@@ -1,5 +1,6 @@
 import { useDebouncedState } from '@rocket.chat/fuselage-hooks';
-import { useEffect, RefObject } from 'react';
+import type { RefObject } from 'react';
+import { useEffect } from 'react';
 
 export const useIsVisible = (ref: RefObject<HTMLInputElement>): [boolean] => {
 	const [menuVisibility, setMenuVisibility] = useDebouncedState(!!window.DISABLE_ANIMATION, 100);
diff --git a/apps/meteor/client/views/room/hooks/useUserHasRoomRole.ts b/apps/meteor/client/views/room/hooks/useUserHasRoomRole.ts
index cc9e93bdf31..508393c6c67 100644
--- a/apps/meteor/client/views/room/hooks/useUserHasRoomRole.ts
+++ b/apps/meteor/client/views/room/hooks/useUserHasRoomRole.ts
@@ -1,4 +1,4 @@
-import { IRole, IRoom, IUser } from '@rocket.chat/core-typings';
+import type { IRole, IRoom, IUser } from '@rocket.chat/core-typings';
 import { useCallback } from 'react';
 
 import { RoomRoles } from '../../../../app/models/client';
diff --git a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useBlockUserAction.ts b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useBlockUserAction.ts
index 3673123d4cd..2d2bbe954a2 100644
--- a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useBlockUserAction.ts
+++ b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useBlockUserAction.ts
@@ -1,9 +1,9 @@
-import { IRoom, IUser } from '@rocket.chat/core-typings';
+import type { IRoom, IUser } from '@rocket.chat/core-typings';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useTranslation, useMethod, useToastMessageDispatch, useUserId, useUserSubscription, useUserRoom } from '@rocket.chat/ui-contexts';
 import { useMemo } from 'react';
 
-import { Action } from '../../../../hooks/useActionSpread';
+import type { Action } from '../../../../hooks/useActionSpread';
 import { getRoomDirectives } from '../../../lib/getRoomDirectives';
 
 export const useBlockUserAction = (user: Pick<IUser, '_id' | 'username'>, rid: IRoom['_id']): Action | undefined => {
diff --git a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useCallAction.tsx b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useCallAction.tsx
index 53dba549f91..bff7e9f6563 100644
--- a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useCallAction.tsx
+++ b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useCallAction.tsx
@@ -1,11 +1,12 @@
-import { IUser, isRoomFederated } from '@rocket.chat/core-typings';
+import type { IUser } from '@rocket.chat/core-typings';
+import { isRoomFederated } from '@rocket.chat/core-typings';
 import { useTranslation, useUserRoom, useUserId, useUserSubscriptionByName } from '@rocket.chat/ui-contexts';
 import { useMemo } from 'react';
 
 import { closeUserCard } from '../../../../../../app/ui/client/lib/UserCard';
 import { useVideoConfDispatchOutgoing, useVideoConfIsCalling, useVideoConfIsRinging } from '../../../../../contexts/VideoConfContext';
 import { VideoConfManager } from '../../../../../lib/VideoConfManager';
-import { Action } from '../../../../hooks/useActionSpread';
+import type { Action } from '../../../../hooks/useActionSpread';
 import { useVideoConfWarning } from '../../../contextualBar/VideoConference/useVideoConfWarning';
 
 export const useCallAction = (user: Pick<IUser, '_id' | 'username'>): Action | undefined => {
diff --git a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useChangeLeaderAction.ts b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useChangeLeaderAction.ts
index 58124bc2d11..74a435d152e 100644
--- a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useChangeLeaderAction.ts
+++ b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useChangeLeaderAction.ts
@@ -1,4 +1,4 @@
-import { IRoom, IUser } from '@rocket.chat/core-typings';
+import type { IRoom, IUser } from '@rocket.chat/core-typings';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { escapeHTML } from '@rocket.chat/string-helpers';
 import { useTranslation, usePermission, useUserRoom } from '@rocket.chat/ui-contexts';
@@ -6,7 +6,7 @@ import { useMemo } from 'react';
 
 import { useEndpointActionExperimental } from '../../../../../hooks/useEndpointActionExperimental';
 import { roomCoordinator } from '../../../../../lib/rooms/roomCoordinator';
-import { Action } from '../../../../hooks/useActionSpread';
+import type { Action } from '../../../../hooks/useActionSpread';
 import { getRoomDirectives } from '../../../lib/getRoomDirectives';
 import { useUserHasRoomRole } from '../../useUserHasRoomRole';
 
diff --git a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useChangeModeratorAction.ts b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useChangeModeratorAction.ts
index 4b4ff6512fe..4b34a9f35f2 100644
--- a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useChangeModeratorAction.ts
+++ b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useChangeModeratorAction.ts
@@ -1,4 +1,4 @@
-import { IRoom, IUser } from '@rocket.chat/core-typings';
+import type { IRoom, IUser } from '@rocket.chat/core-typings';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { escapeHTML } from '@rocket.chat/string-helpers';
 import { useTranslation, usePermission, useUserRoom } from '@rocket.chat/ui-contexts';
@@ -6,7 +6,7 @@ import { useMemo } from 'react';
 
 import { useEndpointActionExperimental } from '../../../../../hooks/useEndpointActionExperimental';
 import { roomCoordinator } from '../../../../../lib/rooms/roomCoordinator';
-import { Action } from '../../../../hooks/useActionSpread';
+import type { Action } from '../../../../hooks/useActionSpread';
 import { getRoomDirectives } from '../../../lib/getRoomDirectives';
 import { useUserHasRoomRole } from '../../useUserHasRoomRole';
 
diff --git a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useChangeOwnerAction.tsx b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useChangeOwnerAction.tsx
index bcf4b4cd44c..2a8eea87921 100644
--- a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useChangeOwnerAction.tsx
+++ b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useChangeOwnerAction.tsx
@@ -1,4 +1,4 @@
-import { IRoom, IUser } from '@rocket.chat/core-typings';
+import type { IRoom, IUser } from '@rocket.chat/core-typings';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { escapeHTML } from '@rocket.chat/string-helpers';
 import { useTranslation, usePermission, useUserRoom } from '@rocket.chat/ui-contexts';
@@ -6,7 +6,7 @@ import { useMemo } from 'react';
 
 import { useEndpointActionExperimental } from '../../../../../hooks/useEndpointActionExperimental';
 import { roomCoordinator } from '../../../../../lib/rooms/roomCoordinator';
-import { Action } from '../../../../hooks/useActionSpread';
+import type { Action } from '../../../../hooks/useActionSpread';
 import { getRoomDirectives } from '../../../lib/getRoomDirectives';
 import { useUserHasRoomRole } from '../../useUserHasRoomRole';
 
diff --git a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useDirectMessageAction.ts b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useDirectMessageAction.ts
index 07f07a78d32..5e7afd246a0 100644
--- a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useDirectMessageAction.ts
+++ b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useDirectMessageAction.ts
@@ -1,9 +1,9 @@
-import { IRoom, IUser, ISubscription } from '@rocket.chat/core-typings';
+import type { IRoom, IUser, ISubscription } from '@rocket.chat/core-typings';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useTranslation, usePermission, useRoute, useUserSubscription, useUserSubscriptionByName } from '@rocket.chat/ui-contexts';
 import { useMemo } from 'react';
 
-import { Action } from '../../../../hooks/useActionSpread';
+import type { Action } from '../../../../hooks/useActionSpread';
 
 const getShouldOpenDirectMessage = (
 	currentSubscription?: ISubscription,
diff --git a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useIgnoreUserAction.ts b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useIgnoreUserAction.ts
index 58701263388..9e813ac8c36 100644
--- a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useIgnoreUserAction.ts
+++ b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useIgnoreUserAction.ts
@@ -1,4 +1,4 @@
-import { IRoom, IUser } from '@rocket.chat/core-typings';
+import type { IRoom, IUser } from '@rocket.chat/core-typings';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import {
 	useTranslation,
@@ -10,7 +10,7 @@ import {
 } from '@rocket.chat/ui-contexts';
 import { useMemo } from 'react';
 
-import { Action } from '../../../../hooks/useActionSpread';
+import type { Action } from '../../../../hooks/useActionSpread';
 import { getRoomDirectives } from '../../../lib/getRoomDirectives';
 
 export const useIgnoreUserAction = (user: Pick<IUser, '_id' | 'username'>, rid: IRoom['_id']): Action | undefined => {
diff --git a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useMuteUserAction.tsx b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useMuteUserAction.tsx
index 028f903915a..cdd3df963bf 100644
--- a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useMuteUserAction.tsx
+++ b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useMuteUserAction.tsx
@@ -1,4 +1,4 @@
-import { IRoom, IUser } from '@rocket.chat/core-typings';
+import type { IRoom, IUser } from '@rocket.chat/core-typings';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { escapeHTML } from '@rocket.chat/string-helpers';
 import {
@@ -14,7 +14,7 @@ import React, { useMemo } from 'react';
 
 import GenericModal from '../../../../../components/GenericModal';
 import { roomCoordinator } from '../../../../../lib/rooms/roomCoordinator';
-import { Action } from '../../../../hooks/useActionSpread';
+import type { Action } from '../../../../hooks/useActionSpread';
 import { getRoomDirectives } from '../../../lib/getRoomDirectives';
 
 const getUserIsMuted = (
diff --git a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useRemoveUserAction.tsx b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useRemoveUserAction.tsx
index c39cd61013b..1bd5c022394 100644
--- a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useRemoveUserAction.tsx
+++ b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useRemoveUserAction.tsx
@@ -1,4 +1,5 @@
-import { IRoom, isRoomFederated, IUser } from '@rocket.chat/core-typings';
+import type { IRoom, IUser } from '@rocket.chat/core-typings';
+import { isRoomFederated } from '@rocket.chat/core-typings';
 import { Box, Icon } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { escapeHTML } from '@rocket.chat/string-helpers';
@@ -9,7 +10,7 @@ import GenericModal from '../../../../../components/GenericModal';
 import { useEndpointActionExperimental } from '../../../../../hooks/useEndpointActionExperimental';
 import * as Federation from '../../../../../lib/federation/Federation';
 import { roomCoordinator } from '../../../../../lib/rooms/roomCoordinator';
-import { Action } from '../../../../hooks/useActionSpread';
+import type { Action } from '../../../../hooks/useActionSpread';
 import RemoveUsersModal from '../../../../teams/contextualBar/members/RemoveUsersModal';
 import { getRoomDirectives } from '../../../lib/getRoomDirectives';
 
diff --git a/apps/meteor/client/views/room/hooks/useUserInfoActions/useUserInfoActions.ts b/apps/meteor/client/views/room/hooks/useUserInfoActions/useUserInfoActions.ts
index c907a536147..5b7be9e3643 100644
--- a/apps/meteor/client/views/room/hooks/useUserInfoActions/useUserInfoActions.ts
+++ b/apps/meteor/client/views/room/hooks/useUserInfoActions/useUserInfoActions.ts
@@ -1,7 +1,7 @@
-import { IRoom, IUser } from '@rocket.chat/core-typings';
+import type { IRoom, IUser } from '@rocket.chat/core-typings';
 import { useMemo } from 'react';
 
-import { Action } from '../../../hooks/useActionSpread';
+import type { Action } from '../../../hooks/useActionSpread';
 import { useBlockUserAction } from './actions/useBlockUserAction';
 import { useCallAction } from './actions/useCallAction';
 import { useChangeLeaderAction } from './actions/useChangeLeaderAction';
diff --git a/apps/meteor/client/views/room/layout/RoomLayout.tsx b/apps/meteor/client/views/room/layout/RoomLayout.tsx
index ecf6be29c0e..fcd0faac81d 100644
--- a/apps/meteor/client/views/room/layout/RoomLayout.tsx
+++ b/apps/meteor/client/views/room/layout/RoomLayout.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { ComponentProps, ReactElement, ReactNode } from 'react';
+import type { ComponentProps, ReactElement, ReactNode } from 'react';
+import React from 'react';
 
 import VerticalBar from '../../../components/VerticalBar/VerticalBar';
 
diff --git a/apps/meteor/client/views/room/lib/QuickActions/QuickActionsContext.tsx b/apps/meteor/client/views/room/lib/QuickActions/QuickActionsContext.tsx
index 44d5bf44510..b468d865013 100644
--- a/apps/meteor/client/views/room/lib/QuickActions/QuickActionsContext.tsx
+++ b/apps/meteor/client/views/room/lib/QuickActions/QuickActionsContext.tsx
@@ -1,20 +1,21 @@
-import { EventHandlerOf } from '@rocket.chat/emitter';
+import type { EventHandlerOf } from '@rocket.chat/emitter';
 import { createContext, useContext } from 'react';
 
-import { actions, listen, QuickActionsActionConfig, QuickActionsAction, Events } from '.';
+import type { QuickActionsActionConfig, QuickActionsAction, Events } from '.';
+import { actions, listen } from '.';
 
 import './defaultActions';
 
 export type QuickActionsEventHandler = (handler: EventHandlerOf<Events, 'change'>) => unknown;
 
-export type QuickActionsContext = {
+export type QuickActionsContextValue = {
 	actions: Map<QuickActionsActionConfig['id'], QuickActionsAction>;
 	listen: QuickActionsEventHandler;
 };
 
-export const QuickActionsContext = createContext<QuickActionsContext>({
+export const QuickActionsContext = createContext<QuickActionsContextValue>({
 	actions,
 	listen,
 });
 
-export const useQuickActionsContext = (): QuickActionsContext => useContext(QuickActionsContext);
+export const useQuickActionsContext = (): QuickActionsContextValue => useContext(QuickActionsContext);
diff --git a/apps/meteor/client/views/room/lib/QuickActions/index.tsx b/apps/meteor/client/views/room/lib/QuickActions/index.tsx
index 0ee51425531..ba84a221e64 100644
--- a/apps/meteor/client/views/room/lib/QuickActions/index.tsx
+++ b/apps/meteor/client/views/room/lib/QuickActions/index.tsx
@@ -1,9 +1,10 @@
 import type { IRoom } from '@rocket.chat/core-typings';
-import { Box, Option } from '@rocket.chat/fuselage';
-import { ComponentProps, ReactNode } from 'react';
+import type { Box, Option } from '@rocket.chat/fuselage';
+import type { ComponentProps, ReactNode } from 'react';
 
-import { ToolboxActionConfig } from '../Toolbox';
-import { generator, Events as GeneratorEvents } from '../Toolbox/generator';
+import type { ToolboxActionConfig } from '../Toolbox';
+import type { Events as GeneratorEvents } from '../Toolbox/generator';
+import { generator } from '../Toolbox/generator';
 
 type QuickActionsHook = ({ room }: { room: IRoom }) => QuickActionsActionConfig | null;
 
diff --git a/apps/meteor/client/views/room/lib/Toolbox/generator.tsx b/apps/meteor/client/views/room/lib/Toolbox/generator.tsx
index 5e6ee5889ef..10441890f53 100644
--- a/apps/meteor/client/views/room/lib/Toolbox/generator.tsx
+++ b/apps/meteor/client/views/room/lib/Toolbox/generator.tsx
@@ -1,4 +1,5 @@
-import { Emitter, EventHandlerOf } from '@rocket.chat/emitter';
+import type { EventHandlerOf } from '@rocket.chat/emitter';
+import { Emitter } from '@rocket.chat/emitter';
 
 export type Store<T> = Map<string, T>;
 
diff --git a/apps/meteor/client/views/room/lib/Toolbox/index.tsx b/apps/meteor/client/views/room/lib/Toolbox/index.tsx
index ecbafa7ad45..b024d7a3af5 100644
--- a/apps/meteor/client/views/room/lib/Toolbox/index.tsx
+++ b/apps/meteor/client/views/room/lib/Toolbox/index.tsx
@@ -1,10 +1,11 @@
 import type { IRoom } from '@rocket.chat/core-typings';
-import { Box, Option, Icon } from '@rocket.chat/fuselage';
-import { TranslationKey } from '@rocket.chat/ui-contexts';
-import { ReactNode, MouseEvent, ComponentProps, ComponentType } from 'react';
+import type { Box, Option, Icon } from '@rocket.chat/fuselage';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import type { ReactNode, MouseEvent, ComponentProps, ComponentType } from 'react';
 
-import { ToolboxContextValue } from '../../contexts/ToolboxContext';
-import { generator, Events as GeneratorEvents } from './generator';
+import type { ToolboxContextValue } from '../../contexts/ToolboxContext';
+import type { Events as GeneratorEvents } from './generator';
+import { generator } from './generator';
 
 type ToolboxHook = ({ room }: { room: IRoom }) => ToolboxActionConfig | null;
 
diff --git a/apps/meteor/client/views/room/lib/getRoomDirectives.ts b/apps/meteor/client/views/room/lib/getRoomDirectives.ts
index 2f5602f02d2..7ef5c2dfd02 100644
--- a/apps/meteor/client/views/room/lib/getRoomDirectives.ts
+++ b/apps/meteor/client/views/room/lib/getRoomDirectives.ts
@@ -1,4 +1,4 @@
-import { IRoom } from '@rocket.chat/core-typings';
+import type { IRoom } from '@rocket.chat/core-typings';
 
 import { RoomMemberActions } from '../../../../definition/IRoomTypeConfig';
 import { roomCoordinator } from '../../../lib/rooms/roomCoordinator';
diff --git a/apps/meteor/client/views/room/modals/FileUploadModal/FilePreview.tsx b/apps/meteor/client/views/room/modals/FileUploadModal/FilePreview.tsx
index a6f7ce1bb95..c898c8b0081 100644
--- a/apps/meteor/client/views/room/modals/FileUploadModal/FilePreview.tsx
+++ b/apps/meteor/client/views/room/modals/FileUploadModal/FilePreview.tsx
@@ -1,4 +1,5 @@
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { isIE11 } from '../../../../lib/utils/isIE11';
 import GenericPreview from './GenericPreview';
diff --git a/apps/meteor/client/views/room/modals/FileUploadModal/FileUploadModal.stories.tsx b/apps/meteor/client/views/room/modals/FileUploadModal/FileUploadModal.stories.tsx
index c2efd2610aa..91b3436867c 100644
--- a/apps/meteor/client/views/room/modals/FileUploadModal/FileUploadModal.stories.tsx
+++ b/apps/meteor/client/views/room/modals/FileUploadModal/FileUploadModal.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import FileUploadModal from '.';
diff --git a/apps/meteor/client/views/room/modals/FileUploadModal/FileUploadModal.tsx b/apps/meteor/client/views/room/modals/FileUploadModal/FileUploadModal.tsx
index d5c6724840f..66b0993a751 100644
--- a/apps/meteor/client/views/room/modals/FileUploadModal/FileUploadModal.tsx
+++ b/apps/meteor/client/views/room/modals/FileUploadModal/FileUploadModal.tsx
@@ -1,7 +1,8 @@
 import { Modal, Box, Field, FieldGroup, TextInput, Button } from '@rocket.chat/fuselage';
 import { useAutoFocus } from '@rocket.chat/fuselage-hooks';
 import { useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, memo, useState, ChangeEvent, FormEventHandler, useEffect } from 'react';
+import type { ReactElement, ChangeEvent, FormEventHandler } from 'react';
+import React, { memo, useState, useEffect } from 'react';
 
 import FilePreview from './FilePreview';
 
diff --git a/apps/meteor/client/views/room/modals/FileUploadModal/GenericPreview.tsx b/apps/meteor/client/views/room/modals/FileUploadModal/GenericPreview.tsx
index c6bf415310a..dd251bec676 100644
--- a/apps/meteor/client/views/room/modals/FileUploadModal/GenericPreview.tsx
+++ b/apps/meteor/client/views/room/modals/FileUploadModal/GenericPreview.tsx
@@ -1,5 +1,6 @@
 import { Box, Icon } from '@rocket.chat/fuselage';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { formatBytes } from '../../../../lib/utils/formatBytes';
 
diff --git a/apps/meteor/client/views/room/modals/FileUploadModal/ImagePreview.tsx b/apps/meteor/client/views/room/modals/FileUploadModal/ImagePreview.tsx
index 28cf50efd67..a0b01216767 100644
--- a/apps/meteor/client/views/room/modals/FileUploadModal/ImagePreview.tsx
+++ b/apps/meteor/client/views/room/modals/FileUploadModal/ImagePreview.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { useState, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useState } from 'react';
 
 import GenericPreview from './GenericPreview';
 import PreviewSkeleton from './PreviewSkeleton';
diff --git a/apps/meteor/client/views/room/modals/FileUploadModal/MediaPreview.tsx b/apps/meteor/client/views/room/modals/FileUploadModal/MediaPreview.tsx
index fd2d05c6e9f..e56c8a1643d 100644
--- a/apps/meteor/client/views/room/modals/FileUploadModal/MediaPreview.tsx
+++ b/apps/meteor/client/views/room/modals/FileUploadModal/MediaPreview.tsx
@@ -1,6 +1,7 @@
 import { Box, Icon } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useEffect, useState, memo } from 'react';
+import type { ReactElement } from 'react';
+import React, { useEffect, useState, memo } from 'react';
 
 import { userAgentMIMETypeFallback } from '../../../../lib/utils/userAgentMIMETypeFallback';
 import { FilePreviewType } from './FilePreview';
diff --git a/apps/meteor/client/views/room/modals/FileUploadModal/PreviewSkeleton.tsx b/apps/meteor/client/views/room/modals/FileUploadModal/PreviewSkeleton.tsx
index 8940a5e8e59..72017e26e9f 100644
--- a/apps/meteor/client/views/room/modals/FileUploadModal/PreviewSkeleton.tsx
+++ b/apps/meteor/client/views/room/modals/FileUploadModal/PreviewSkeleton.tsx
@@ -1,5 +1,6 @@
 import { Skeleton } from '@rocket.chat/fuselage';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 const PreviewSkeleton = (): ReactElement => <Skeleton variant='rect' w='full' h='x200' />;
 
diff --git a/apps/meteor/client/views/room/modals/ReactionListModal/ReactionListModal.tsx b/apps/meteor/client/views/room/modals/ReactionListModal/ReactionListModal.tsx
index b67c5aadbc1..8cc7371bb08 100644
--- a/apps/meteor/client/views/room/modals/ReactionListModal/ReactionListModal.tsx
+++ b/apps/meteor/client/views/room/modals/ReactionListModal/ReactionListModal.tsx
@@ -1,11 +1,12 @@
 import type { IMessage } from '@rocket.chat/core-typings';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { openUserCard } from '../../../../../app/ui/client/lib/UserCard';
 import GenericModal from '../../../../components/GenericModal';
-import { ToolboxContextValue } from '../../contexts/ToolboxContext';
+import type { ToolboxContextValue } from '../../contexts/ToolboxContext';
 import Reactions from './Reactions';
 
 type ReactionListProps = {
diff --git a/apps/meteor/client/views/room/modals/ReactionListModal/ReactionUserTag.tsx b/apps/meteor/client/views/room/modals/ReactionListModal/ReactionUserTag.tsx
index b86538af372..3eb002106d2 100644
--- a/apps/meteor/client/views/room/modals/ReactionListModal/ReactionUserTag.tsx
+++ b/apps/meteor/client/views/room/modals/ReactionListModal/ReactionUserTag.tsx
@@ -1,14 +1,15 @@
 import type { IUser } from '@rocket.chat/core-typings';
 import { Box, Tag } from '@rocket.chat/fuselage';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
-type ReactionUserTag = {
+type ReactionUserTagProps = {
 	username: IUser['username'];
 	onClick: (e: React.MouseEvent<HTMLElement>) => void;
 	displayName: string;
 };
 
-const ReactionUserTag = ({ username, onClick, displayName }: ReactionUserTag): ReactElement => (
+const ReactionUserTag = ({ username, onClick, displayName }: ReactionUserTagProps): ReactElement => (
 	<Box mie='x4' mbe='x4' data-username={username} onClick={onClick} key={displayName}>
 		<Tag variant='primary'>{displayName}</Tag>
 	</Box>
diff --git a/apps/meteor/client/views/room/modals/ReactionListModal/Reactions.tsx b/apps/meteor/client/views/room/modals/ReactionListModal/Reactions.tsx
index d8fd43341b3..84e77e5c59c 100644
--- a/apps/meteor/client/views/room/modals/ReactionListModal/Reactions.tsx
+++ b/apps/meteor/client/views/room/modals/ReactionListModal/Reactions.tsx
@@ -1,7 +1,8 @@
 import type { IMessage } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
 import { useSetting } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import Emoji from '../../../../components/Emoji';
 import ReactionUserTag from './ReactionUserTag';
diff --git a/apps/meteor/client/views/room/modals/ReadReceiptsModal/ReadReceiptRow.tsx b/apps/meteor/client/views/room/modals/ReadReceiptsModal/ReadReceiptRow.tsx
index 6531d38467c..4bf4f967bf2 100644
--- a/apps/meteor/client/views/room/modals/ReadReceiptsModal/ReadReceiptRow.tsx
+++ b/apps/meteor/client/views/room/modals/ReadReceiptsModal/ReadReceiptRow.tsx
@@ -2,7 +2,8 @@ import type { ReadReceipt } from '@rocket.chat/core-typings';
 import { css } from '@rocket.chat/css-in-js';
 import { Box } from '@rocket.chat/fuselage';
 import colors from '@rocket.chat/fuselage-tokens/colors';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import UserAvatar from '../../../../components/avatar/UserAvatar';
 import { useFormatDateAndTime } from '../../../../hooks/useFormatDateAndTime';
diff --git a/apps/meteor/client/views/room/modals/ReadReceiptsModal/ReadReceiptsModal.tsx b/apps/meteor/client/views/room/modals/ReadReceiptsModal/ReadReceiptsModal.tsx
index d25a95131f4..418f45baefa 100644
--- a/apps/meteor/client/views/room/modals/ReadReceiptsModal/ReadReceiptsModal.tsx
+++ b/apps/meteor/client/views/room/modals/ReadReceiptsModal/ReadReceiptsModal.tsx
@@ -1,8 +1,9 @@
-import { IMessage, ReadReceipt } from '@rocket.chat/core-typings';
+import type { IMessage, ReadReceipt } from '@rocket.chat/core-typings';
 import { Skeleton } from '@rocket.chat/fuselage';
 import { useMethod, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
-import React, { ReactElement, useEffect } from 'react';
+import type { ReactElement } from 'react';
+import React, { useEffect } from 'react';
 
 import GenericModal from '../../../../components/GenericModal';
 import ReadReceiptRow from './ReadReceiptRow';
diff --git a/apps/meteor/client/views/room/modals/ReportMessageModal/ReportMessageModal.tsx b/apps/meteor/client/views/room/modals/ReportMessageModal/ReportMessageModal.tsx
index 66b489880c4..280766c3915 100644
--- a/apps/meteor/client/views/room/modals/ReportMessageModal/ReportMessageModal.tsx
+++ b/apps/meteor/client/views/room/modals/ReportMessageModal/ReportMessageModal.tsx
@@ -1,8 +1,9 @@
-import { IMessage } from '@rocket.chat/core-typings';
+import type { IMessage } from '@rocket.chat/core-typings';
 import { css } from '@rocket.chat/css-in-js';
 import { TextAreaInput, FieldGroup, Field, Box } from '@rocket.chat/fuselage';
 import { useToastMessageDispatch, useTranslation, useMethod } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 import { useForm } from 'react-hook-form';
 
 import GenericModal from '../../../../components/GenericModal';
diff --git a/apps/meteor/client/views/room/providers/ChatProvider.tsx b/apps/meteor/client/views/room/providers/ChatProvider.tsx
index 6149303cec2..6191b4ae55c 100644
--- a/apps/meteor/client/views/room/providers/ChatProvider.tsx
+++ b/apps/meteor/client/views/room/providers/ChatProvider.tsx
@@ -1,4 +1,5 @@
-import React, { ReactElement, ReactNode, useEffect, useMemo } from 'react';
+import type { ReactElement, ReactNode } from 'react';
+import React, { useEffect, useMemo } from 'react';
 
 import { ChatMessages } from '../../../../app/ui/client/lib/ChatMessages';
 import { ChatContext } from '../contexts/ChatContext';
diff --git a/apps/meteor/client/views/room/providers/MessageProvider.tsx b/apps/meteor/client/views/room/providers/MessageProvider.tsx
index 30e0c30b63d..a2eb88e1ffc 100644
--- a/apps/meteor/client/views/room/providers/MessageProvider.tsx
+++ b/apps/meteor/client/views/room/providers/MessageProvider.tsx
@@ -1,6 +1,7 @@
-import { IMessage } from '@rocket.chat/core-typings';
+import type { IMessage } from '@rocket.chat/core-typings';
 import { useLayout, useCurrentRoute, useRoute, useSetting } from '@rocket.chat/ui-contexts';
-import React, { ReactNode, useMemo, memo, MouseEvent, UIEvent } from 'react';
+import type { ReactNode, MouseEvent, UIEvent } from 'react';
+import React, { useMemo, memo } from 'react';
 
 import { actionLinks } from '../../../../app/action-links/client';
 import { openUserCard } from '../../../../app/ui/client/lib/UserCard';
diff --git a/apps/meteor/client/views/room/providers/RoomProvider.tsx b/apps/meteor/client/views/room/providers/RoomProvider.tsx
index bf175e41520..15e876c07bd 100644
--- a/apps/meteor/client/views/room/providers/RoomProvider.tsx
+++ b/apps/meteor/client/views/room/providers/RoomProvider.tsx
@@ -1,6 +1,7 @@
-import { IRoom } from '@rocket.chat/core-typings';
+import type { IRoom } from '@rocket.chat/core-typings';
 import { useRoute } from '@rocket.chat/ui-contexts';
-import React, { ReactNode, useMemo, memo, useEffect, ContextType, ReactElement, useCallback } from 'react';
+import type { ReactNode, ContextType, ReactElement } from 'react';
+import React, { useMemo, memo, useEffect, useCallback } from 'react';
 
 import { RoomHistoryManager } from '../../../../app/ui-utils/client';
 import { UserAction } from '../../../../app/ui/client';
diff --git a/apps/meteor/client/views/room/providers/SelectedMessagesProvider.tsx b/apps/meteor/client/views/room/providers/SelectedMessagesProvider.tsx
index 35f3514bdbb..aa55b7c592c 100644
--- a/apps/meteor/client/views/room/providers/SelectedMessagesProvider.tsx
+++ b/apps/meteor/client/views/room/providers/SelectedMessagesProvider.tsx
@@ -1,5 +1,6 @@
 import { Emitter } from '@rocket.chat/emitter';
-import React, { FC, useMemo } from 'react';
+import type { FC } from 'react';
+import React, { useMemo } from 'react';
 
 import { SelectedMessageContext } from '../MessageList/contexts/SelectedMessagesContext';
 
diff --git a/apps/meteor/client/views/room/providers/ToolboxProvider.tsx b/apps/meteor/client/views/room/providers/ToolboxProvider.tsx
index e091ffb00c5..da814af1193 100644
--- a/apps/meteor/client/views/room/providers/ToolboxProvider.tsx
+++ b/apps/meteor/client/views/room/providers/ToolboxProvider.tsx
@@ -1,11 +1,13 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { useDebouncedState, useMutableCallback, useSafely } from '@rocket.chat/fuselage-hooks';
 import { useCurrentRoute, useRoute, useUserId, useSetting } from '@rocket.chat/ui-contexts';
-import React, { ReactNode, useMemo } from 'react';
+import type { ReactNode } from 'react';
+import React, { useMemo } from 'react';
 
-import { ToolboxContext, ToolboxContextValue } from '../contexts/ToolboxContext';
-import { Store } from '../lib/Toolbox/generator';
-import { ToolboxAction, ToolboxActionConfig } from '../lib/Toolbox/index';
+import type { ToolboxContextValue } from '../contexts/ToolboxContext';
+import { ToolboxContext } from '../contexts/ToolboxContext';
+import type { Store } from '../lib/Toolbox/generator';
+import type { ToolboxAction, ToolboxActionConfig } from '../lib/Toolbox/index';
 import VirtualAction from './VirtualAction';
 import { useToolboxActions } from './hooks/useToolboxActions';
 
diff --git a/apps/meteor/client/views/room/providers/VirtualAction.tsx b/apps/meteor/client/views/room/providers/VirtualAction.tsx
index e735ea3e1f1..22068b66899 100644
--- a/apps/meteor/client/views/room/providers/VirtualAction.tsx
+++ b/apps/meteor/client/views/room/providers/VirtualAction.tsx
@@ -1,9 +1,8 @@
-import type { IRoom } from '@rocket.chat/core-typings';
-import { RoomType } from '@rocket.chat/core-typings';
+import type { IRoom, RoomType } from '@rocket.chat/core-typings';
 import { useLayoutEffect, memo } from 'react';
 
-import { Store } from '../lib/Toolbox/generator';
-import { ToolboxAction } from '../lib/Toolbox/index';
+import type { Store } from '../lib/Toolbox/generator';
+import type { ToolboxAction } from '../lib/Toolbox/index';
 
 const groupsDict: Record<RoomType, string> = {
 	l: 'live',
diff --git a/apps/meteor/client/views/room/providers/hooks/useToolboxActions.ts b/apps/meteor/client/views/room/providers/hooks/useToolboxActions.ts
index a67e0492407..c59ddc07546 100644
--- a/apps/meteor/client/views/room/providers/hooks/useToolboxActions.ts
+++ b/apps/meteor/client/views/room/providers/hooks/useToolboxActions.ts
@@ -2,8 +2,9 @@ import type { IRoom } from '@rocket.chat/core-typings';
 import { useSafely } from '@rocket.chat/fuselage-hooks';
 import { useContext, useState, useLayoutEffect } from 'react';
 
-import { ToolboxContext, ToolboxEventHandler } from '../../contexts/ToolboxContext';
-import { ToolboxAction } from '../../lib/Toolbox/index';
+import type { ToolboxEventHandler } from '../../contexts/ToolboxContext';
+import { ToolboxContext } from '../../contexts/ToolboxContext';
+import type { ToolboxAction } from '../../lib/Toolbox/index';
 
 export const useToolboxActions = (room: IRoom): { listen: ToolboxEventHandler; actions: Array<[string, ToolboxAction]> } => {
 	const { listen, actions } = useContext(ToolboxContext);
diff --git a/apps/meteor/client/views/room/threads/ThreadComponent.tsx b/apps/meteor/client/views/room/threads/ThreadComponent.tsx
index 5bc3d18d39e..d7ee4afe5f5 100644
--- a/apps/meteor/client/views/room/threads/ThreadComponent.tsx
+++ b/apps/meteor/client/views/room/threads/ThreadComponent.tsx
@@ -5,7 +5,8 @@ import { Blaze } from 'meteor/blaze';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
 import { Tracker } from 'meteor/tracker';
-import React, { useEffect, useRef, useState, useCallback, useMemo, FC, useContext } from 'react';
+import type { FC } from 'react';
+import React, { useEffect, useRef, useState, useCallback, useMemo, useContext } from 'react';
 
 import { ChatMessage } from '../../../../app/models/client';
 import { normalizeThreadTitle } from '../../../../app/threads/client/lib/normalizeThreadTitle';
diff --git a/apps/meteor/client/views/room/threads/ThreadSkeleton.tsx b/apps/meteor/client/views/room/threads/ThreadSkeleton.tsx
index 1b554a2bce5..35aa2274eb3 100644
--- a/apps/meteor/client/views/room/threads/ThreadSkeleton.tsx
+++ b/apps/meteor/client/views/room/threads/ThreadSkeleton.tsx
@@ -1,5 +1,6 @@
 import { Modal, Box } from '@rocket.chat/fuselage';
-import React, { FC, useMemo } from 'react';
+import type { FC } from 'react';
+import React, { useMemo } from 'react';
 
 import VerticalBar from '../../../components/VerticalBar';
 
diff --git a/apps/meteor/client/views/room/threads/ThreadView.tsx b/apps/meteor/client/views/room/threads/ThreadView.tsx
index 1e5be587ea4..de446e1d6c6 100644
--- a/apps/meteor/client/views/room/threads/ThreadView.tsx
+++ b/apps/meteor/client/views/room/threads/ThreadView.tsx
@@ -1,7 +1,8 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Modal, Box } from '@rocket.chat/fuselage';
 import { useLayoutContextualBarExpanded, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ComponentProps, useCallback, useMemo, forwardRef } from 'react';
+import type { ComponentProps } from 'react';
+import React, { useCallback, useMemo, forwardRef } from 'react';
 
 import VerticalBar from '../../../components/VerticalBar';
 
diff --git a/apps/meteor/client/views/room/webdav/AddWebdavAccountModal.tsx b/apps/meteor/client/views/room/webdav/AddWebdavAccountModal.tsx
index 354681353c5..6ca8f86abc9 100644
--- a/apps/meteor/client/views/room/webdav/AddWebdavAccountModal.tsx
+++ b/apps/meteor/client/views/room/webdav/AddWebdavAccountModal.tsx
@@ -1,8 +1,10 @@
 import type { IWebdavAccountPayload } from '@rocket.chat/core-typings';
 import { Modal, Field, FieldGroup, TextInput, PasswordInput, Button } from '@rocket.chat/fuselage';
 import { useToastMessageDispatch, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useState, ReactElement } from 'react';
-import { useForm, SubmitHandler } from 'react-hook-form';
+import type { ReactElement } from 'react';
+import React, { useState } from 'react';
+import type { SubmitHandler } from 'react-hook-form';
+import { useForm } from 'react-hook-form';
 
 type AddWebdavAccountModalPayload = IWebdavAccountPayload;
 
diff --git a/apps/meteor/client/views/room/webdav/SaveToWebdavModal.tsx b/apps/meteor/client/views/room/webdav/SaveToWebdavModal.tsx
index 067b9b76aa5..762a5444720 100644
--- a/apps/meteor/client/views/room/webdav/SaveToWebdavModal.tsx
+++ b/apps/meteor/client/views/room/webdav/SaveToWebdavModal.tsx
@@ -1,8 +1,10 @@
-import { MessageAttachment, IWebdavAccount } from '@rocket.chat/core-typings';
-import { Modal, Box, Button, FieldGroup, Field, Select, SelectOption, Throbber } from '@rocket.chat/fuselage';
+import type { MessageAttachment, IWebdavAccount } from '@rocket.chat/core-typings';
+import type { SelectOption } from '@rocket.chat/fuselage';
+import { Modal, Box, Button, FieldGroup, Field, Select, Throbber } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import { useMethod, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useState, useMemo, useEffect, useRef } from 'react';
+import type { ReactElement } from 'react';
+import React, { useState, useMemo, useEffect, useRef } from 'react';
 import { useForm, Controller } from 'react-hook-form';
 
 import { useEndpointData } from '../../../hooks/useEndpointData';
diff --git a/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/FilePickerBreadcrumbs.tsx b/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/FilePickerBreadcrumbs.tsx
index 72a8acf8482..c302604f85e 100644
--- a/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/FilePickerBreadcrumbs.tsx
+++ b/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/FilePickerBreadcrumbs.tsx
@@ -1,6 +1,7 @@
 import { Box, Icon, IconButton, Tag } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, MouseEvent } from 'react';
+import type { ReactElement, MouseEvent } from 'react';
+import React from 'react';
 
 type FilePickerBreadcrumbsProps = {
 	parentFolders: string[];
diff --git a/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerGrid/WebdavFilePickerGrid.tsx b/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerGrid/WebdavFilePickerGrid.tsx
index 74d093349cf..dce63e8bb4e 100644
--- a/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerGrid/WebdavFilePickerGrid.tsx
+++ b/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerGrid/WebdavFilePickerGrid.tsx
@@ -1,9 +1,10 @@
-import { IWebdavNode } from '@rocket.chat/core-typings';
+import type { IWebdavNode } from '@rocket.chat/core-typings';
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Icon, Skeleton, States, StatesIcon, StatesTitle } from '@rocket.chat/fuselage';
 import colors from '@rocket.chat/fuselage-tokens/colors.json';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, ComponentProps } from 'react';
+import type { ReactElement, ComponentProps } from 'react';
+import React from 'react';
 
 import { getNodeIconType } from '../lib/getNodeIconType';
 import WebdavFilePickerGridItem from './WebdavFilePickerGridItem';
diff --git a/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerGrid/WebdavFilePickerGridItem.tsx b/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerGrid/WebdavFilePickerGridItem.tsx
index 7315e690c56..8f1780ad972 100644
--- a/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerGrid/WebdavFilePickerGridItem.tsx
+++ b/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerGrid/WebdavFilePickerGridItem.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 const WebdavFilePickerGridItem = ({ ...props }): ReactElement => (
 	<Box
diff --git a/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerModal.tsx b/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerModal.tsx
index 6506578c067..9a613b1ecc3 100644
--- a/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerModal.tsx
+++ b/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerModal.tsx
@@ -1,8 +1,10 @@
-import { IWebdavNode, IWebdavAccountIntegration } from '@rocket.chat/core-typings';
-import { Modal, Box, IconButton, Select, SelectOption } from '@rocket.chat/fuselage';
+import type { IWebdavNode, IWebdavAccountIntegration } from '@rocket.chat/core-typings';
+import type { SelectOption } from '@rocket.chat/fuselage';
+import { Modal, Box, IconButton, Select } from '@rocket.chat/fuselage';
 import { useMutableCallback, useDebouncedValue } from '@rocket.chat/fuselage-hooks';
 import { useMethod, useToastMessageDispatch, useTranslation, useSetModal } from '@rocket.chat/ui-contexts';
-import React, { useState, ReactElement, useEffect, useCallback, MouseEvent } from 'react';
+import type { ReactElement, MouseEvent } from 'react';
+import React, { useState, useEffect, useCallback } from 'react';
 
 import { fileUploadIsValidContentType } from '../../../../../app/utils/client';
 import FilterByText from '../../../../components/FilterByText';
diff --git a/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerTable.tsx b/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerTable.tsx
index 63f0fe1cf88..594877380ed 100644
--- a/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerTable.tsx
+++ b/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerTable.tsx
@@ -1,7 +1,8 @@
-import { IWebdavNode } from '@rocket.chat/core-typings';
+import type { IWebdavNode } from '@rocket.chat/core-typings';
 import { Box, Icon, States, StatesIcon, StatesTitle } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, ComponentProps } from 'react';
+import type { ReactElement, ComponentProps } from 'react';
+import React from 'react';
 
 import {
 	GenericTable,
diff --git a/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/lib/sortWebdavNodes.ts b/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/lib/sortWebdavNodes.ts
index 4b6a95b4454..f8f4468a22d 100644
--- a/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/lib/sortWebdavNodes.ts
+++ b/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/lib/sortWebdavNodes.ts
@@ -1,4 +1,4 @@
-import { IWebdavNode } from '@rocket.chat/core-typings';
+import type { IWebdavNode } from '@rocket.chat/core-typings';
 
 export const sortWebdavNodes = (data: IWebdavNode[], sortBy: string, sortDirection?: string): IWebdavNode[] => {
 	if (sortDirection === 'desc') {
diff --git a/apps/meteor/client/views/root/AppLayout.tsx b/apps/meteor/client/views/root/AppLayout.tsx
index b10ba77ded4..e8cac369295 100644
--- a/apps/meteor/client/views/root/AppLayout.tsx
+++ b/apps/meteor/client/views/root/AppLayout.tsx
@@ -1,5 +1,6 @@
 import { PaletteStyleTag } from '@rocket.chat/ui-theming/src/PaletteStyleTag';
-import React, { FC, Fragment, Suspense } from 'react';
+import type { FC } from 'react';
+import React, { Fragment, Suspense } from 'react';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
 
 import { appLayout } from '../../lib/appLayout';
diff --git a/apps/meteor/client/views/root/AppRoot.tsx b/apps/meteor/client/views/root/AppRoot.tsx
index 9f954d5650e..6168584a19f 100644
--- a/apps/meteor/client/views/root/AppRoot.tsx
+++ b/apps/meteor/client/views/root/AppRoot.tsx
@@ -1,5 +1,6 @@
 import { QueryClientProvider } from '@tanstack/react-query';
-import React, { FC, lazy, Suspense } from 'react';
+import type { FC } from 'react';
+import React, { lazy, Suspense } from 'react';
 
 import { OmnichannelRoomIconProvider } from '../../components/RoomIcon/OmnichannelRoomIcon/provider/OmnichannelRoomIconProvider';
 import { queryClient } from '../../lib/queryClient';
diff --git a/apps/meteor/client/views/root/BlazeTemplate.tsx b/apps/meteor/client/views/root/BlazeTemplate.tsx
index 5475c086ea0..3eb9cc6ffd2 100644
--- a/apps/meteor/client/views/root/BlazeTemplate.tsx
+++ b/apps/meteor/client/views/root/BlazeTemplate.tsx
@@ -1,8 +1,9 @@
 import { Blaze } from 'meteor/blaze';
-import { EJSONable } from 'meteor/ejson';
+import type { EJSONable } from 'meteor/ejson';
 import { ReactiveDict } from 'meteor/reactive-dict';
 import { Template } from 'meteor/templating';
-import React, { FC, useEffect, useRef } from 'react';
+import type { FC } from 'react';
+import React, { useEffect, useRef } from 'react';
 
 type BlazeTemplateProps = {
 	template: keyof typeof Template;
diff --git a/apps/meteor/client/views/root/MainLayout/AuthenticationCheck.tsx b/apps/meteor/client/views/root/MainLayout/AuthenticationCheck.tsx
index 59ea01d6d20..0850d229b12 100644
--- a/apps/meteor/client/views/root/MainLayout/AuthenticationCheck.tsx
+++ b/apps/meteor/client/views/root/MainLayout/AuthenticationCheck.tsx
@@ -1,5 +1,6 @@
 import { useSession, useUserId, useSetting } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, ReactNode } from 'react';
+import type { ReactElement, ReactNode } from 'react';
+import React from 'react';
 
 import LoginPage from './LoginPage';
 import UsernameCheck from './UsernameCheck';
diff --git a/apps/meteor/client/views/root/MainLayout/LayoutWithSidebar.tsx b/apps/meteor/client/views/root/MainLayout/LayoutWithSidebar.tsx
index 9fed698e6f1..0fc0ad179c3 100644
--- a/apps/meteor/client/views/root/MainLayout/LayoutWithSidebar.tsx
+++ b/apps/meteor/client/views/root/MainLayout/LayoutWithSidebar.tsx
@@ -1,6 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
 import { useLayout, useCurrentRoute, useRoutePath, useSetting, useCurrentModal } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, ReactNode, useCallback } from 'react';
+import type { ReactElement, ReactNode } from 'react';
+import React, { useCallback } from 'react';
 
 import { useReactiveValue } from '../../../hooks/useReactiveValue';
 import BlazeTemplate from '../BlazeTemplate';
diff --git a/apps/meteor/client/views/root/MainLayout/LoginPage.tsx b/apps/meteor/client/views/root/MainLayout/LoginPage.tsx
index 5e026ec8331..a60f6c3a0fd 100644
--- a/apps/meteor/client/views/root/MainLayout/LoginPage.tsx
+++ b/apps/meteor/client/views/root/MainLayout/LoginPage.tsx
@@ -1,6 +1,7 @@
 import { useSession } from '@rocket.chat/ui-contexts';
 import RegistrationRoute from '@rocket.chat/web-ui-registration';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import LoggedOutBanner from '../../../../ee/client/components/deviceManagement/LoggedOutBanner';
 import { useIframeLogin } from './useIframeLogin';
diff --git a/apps/meteor/client/views/root/MainLayout/MainLayout.tsx b/apps/meteor/client/views/root/MainLayout/MainLayout.tsx
index 43fe2e8e144..cd13000d4ec 100644
--- a/apps/meteor/client/views/root/MainLayout/MainLayout.tsx
+++ b/apps/meteor/client/views/root/MainLayout/MainLayout.tsx
@@ -1,4 +1,5 @@
-import React, { ReactElement, ReactNode, Suspense } from 'react';
+import type { ReactElement, ReactNode } from 'react';
+import React, { Suspense } from 'react';
 
 import AuthenticationCheck from './AuthenticationCheck';
 import Preload from './Preload';
diff --git a/apps/meteor/client/views/root/MainLayout/PasswordChangeCheck.tsx b/apps/meteor/client/views/root/MainLayout/PasswordChangeCheck.tsx
index d73c485ade3..91b92b129f3 100644
--- a/apps/meteor/client/views/root/MainLayout/PasswordChangeCheck.tsx
+++ b/apps/meteor/client/views/root/MainLayout/PasswordChangeCheck.tsx
@@ -1,6 +1,7 @@
 import type { IUser } from '@rocket.chat/core-typings';
 import { useUser } from '@rocket.chat/ui-contexts';
-import React, { lazy, ReactElement, ReactNode } from 'react';
+import type { ReactElement, ReactNode } from 'react';
+import React, { lazy } from 'react';
 
 import TwoFactorAuthSetupCheck from './TwoFactorAuthSetupCheck';
 
diff --git a/apps/meteor/client/views/root/MainLayout/Preload.tsx b/apps/meteor/client/views/root/MainLayout/Preload.tsx
index d81b13e8f81..42725bd428d 100644
--- a/apps/meteor/client/views/root/MainLayout/Preload.tsx
+++ b/apps/meteor/client/views/root/MainLayout/Preload.tsx
@@ -1,5 +1,6 @@
 import { useUserId } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, ReactNode, useEffect } from 'react';
+import type { ReactElement, ReactNode } from 'react';
+import React, { useEffect } from 'react';
 
 import { CachedChatSubscription } from '../../../../app/models/client';
 import { settings } from '../../../../app/settings/client';
diff --git a/apps/meteor/client/views/root/MainLayout/TwoFactorAuthSetupCheck.tsx b/apps/meteor/client/views/root/MainLayout/TwoFactorAuthSetupCheck.tsx
index a11f715eb78..e529603ad05 100644
--- a/apps/meteor/client/views/root/MainLayout/TwoFactorAuthSetupCheck.tsx
+++ b/apps/meteor/client/views/root/MainLayout/TwoFactorAuthSetupCheck.tsx
@@ -1,6 +1,7 @@
 import type { IUser } from '@rocket.chat/core-typings';
 import { useLayout, useUser, useSetting } from '@rocket.chat/ui-contexts';
-import React, { lazy, ReactElement, ReactNode, useCallback } from 'react';
+import type { ReactElement, ReactNode } from 'react';
+import React, { lazy, useCallback } from 'react';
 
 import { Roles } from '../../../../app/models/client';
 import { useReactiveValue } from '../../../hooks/useReactiveValue';
diff --git a/apps/meteor/client/views/root/MainLayout/UsernameCheck.tsx b/apps/meteor/client/views/root/MainLayout/UsernameCheck.tsx
index 6643d49de43..c6d8c5f8051 100644
--- a/apps/meteor/client/views/root/MainLayout/UsernameCheck.tsx
+++ b/apps/meteor/client/views/root/MainLayout/UsernameCheck.tsx
@@ -1,6 +1,7 @@
 import type { IUser } from '@rocket.chat/core-typings';
 import { useUserId, useSetting } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, ReactNode, useCallback } from 'react';
+import type { ReactElement, ReactNode } from 'react';
+import React, { useCallback } from 'react';
 
 import { Users } from '../../../../app/models/client';
 import { useReactiveValue } from '../../../hooks/useReactiveValue';
diff --git a/apps/meteor/client/views/root/PageLoading.tsx b/apps/meteor/client/views/root/PageLoading.tsx
index 2ca78d5c1db..bd2b9e1a754 100644
--- a/apps/meteor/client/views/root/PageLoading.tsx
+++ b/apps/meteor/client/views/root/PageLoading.tsx
@@ -1,4 +1,5 @@
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 const PageLoading: FC = () => (
 	<div className='page-loading'>
diff --git a/apps/meteor/client/views/root/PortalWrapper.ts b/apps/meteor/client/views/root/PortalWrapper.ts
index cf7bed6275e..b11724d9c1d 100644
--- a/apps/meteor/client/views/root/PortalWrapper.ts
+++ b/apps/meteor/client/views/root/PortalWrapper.ts
@@ -1,4 +1,5 @@
-import { PureComponent, ReactElement, ReactNode } from 'react';
+import type { ReactElement, ReactNode } from 'react';
+import { PureComponent } from 'react';
 
 type PortalWrapperProps = {
 	portal: ReactElement;
diff --git a/apps/meteor/client/views/root/PortalsWrapper.tsx b/apps/meteor/client/views/root/PortalsWrapper.tsx
index cc31f762e30..68a25941ad5 100644
--- a/apps/meteor/client/views/root/PortalsWrapper.tsx
+++ b/apps/meteor/client/views/root/PortalsWrapper.tsx
@@ -1,4 +1,5 @@
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
 
 import { portalsSubscription } from '../../lib/portals/portalsSubscription';
diff --git a/apps/meteor/client/views/setupWizard/SetupWizardPage.tsx b/apps/meteor/client/views/setupWizard/SetupWizardPage.tsx
index 4c876a07ae0..19d6b9f3cfa 100644
--- a/apps/meteor/client/views/setupWizard/SetupWizardPage.tsx
+++ b/apps/meteor/client/views/setupWizard/SetupWizardPage.tsx
@@ -1,4 +1,5 @@
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { useSetupWizardContext } from './contexts/SetupWizardContext';
 import AdminInfoStep from './steps/AdminInfoStep';
diff --git a/apps/meteor/client/views/setupWizard/SetupWizardRoute.tsx b/apps/meteor/client/views/setupWizard/SetupWizardRoute.tsx
index 603f2e15332..82d9438513f 100644
--- a/apps/meteor/client/views/setupWizard/SetupWizardRoute.tsx
+++ b/apps/meteor/client/views/setupWizard/SetupWizardRoute.tsx
@@ -1,6 +1,7 @@
 import { useBreakpoints } from '@rocket.chat/fuselage-hooks';
 import { DarkModeProvider } from '@rocket.chat/layout';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 import { useTranslation, I18nextProvider } from 'react-i18next';
 
 import SetupWizardPage from './SetupWizardPage';
diff --git a/apps/meteor/client/views/setupWizard/contexts/SetupWizardContext.tsx b/apps/meteor/client/views/setupWizard/contexts/SetupWizardContext.tsx
index 98205e3033a..21cae1fade1 100644
--- a/apps/meteor/client/views/setupWizard/contexts/SetupWizardContext.tsx
+++ b/apps/meteor/client/views/setupWizard/contexts/SetupWizardContext.tsx
@@ -1,6 +1,7 @@
 import type { ISetting } from '@rocket.chat/core-typings';
 import type { AdminInfoPage, OrganizationInfoPage, RegisteredServerPage } from '@rocket.chat/onboarding-ui';
-import { ComponentProps, createContext, useContext, Dispatch, SetStateAction } from 'react';
+import type { ComponentProps, Dispatch, SetStateAction } from 'react';
+import { createContext, useContext } from 'react';
 
 type SetupWizardData = {
 	adminData: Omit<Parameters<ComponentProps<typeof AdminInfoPage>['onSubmit']>[0], 'keepPosted'>;
diff --git a/apps/meteor/client/views/setupWizard/hooks/useParameters.ts b/apps/meteor/client/views/setupWizard/hooks/useParameters.ts
index 93adb3a88e0..b06de4ec953 100644
--- a/apps/meteor/client/views/setupWizard/hooks/useParameters.ts
+++ b/apps/meteor/client/views/setupWizard/hooks/useParameters.ts
@@ -1,6 +1,7 @@
 import type { ISetting } from '@rocket.chat/core-typings';
 import { useMethod } from '@rocket.chat/ui-contexts';
-import { useQuery, UseQueryResult } from '@tanstack/react-query';
+import type { UseQueryResult } from '@tanstack/react-query';
+import { useQuery } from '@tanstack/react-query';
 
 type SetupWizardParameters = {
 	settings: ISetting[];
diff --git a/apps/meteor/client/views/setupWizard/hooks/useStepRouting.ts b/apps/meteor/client/views/setupWizard/hooks/useStepRouting.ts
index c5935fd1b8b..26798c5a697 100644
--- a/apps/meteor/client/views/setupWizard/hooks/useStepRouting.ts
+++ b/apps/meteor/client/views/setupWizard/hooks/useStepRouting.ts
@@ -1,5 +1,6 @@
 import { useRouteParameter, useRoute, useRole } from '@rocket.chat/ui-contexts';
-import { useState, useEffect, Dispatch, SetStateAction } from 'react';
+import type { Dispatch, SetStateAction } from 'react';
+import { useState, useEffect } from 'react';
 
 export const useStepRouting = (): [number, Dispatch<SetStateAction<number>>] => {
 	const param = useRouteParameter('step');
diff --git a/apps/meteor/client/views/setupWizard/providers/SetupWizardProvider.tsx b/apps/meteor/client/views/setupWizard/providers/SetupWizardProvider.tsx
index 21ebec6df6f..0fcb296ec62 100644
--- a/apps/meteor/client/views/setupWizard/providers/SetupWizardProvider.tsx
+++ b/apps/meteor/client/views/setupWizard/providers/SetupWizardProvider.tsx
@@ -11,7 +11,8 @@ import {
 	useTranslation,
 } from '@rocket.chat/ui-contexts';
 import { Meteor } from 'meteor/meteor';
-import React, { useCallback, useMemo, useState, ReactElement, ContextType } from 'react';
+import type { ReactElement, ContextType } from 'react';
+import React, { useCallback, useMemo, useState } from 'react';
 
 import { callbacks } from '../../../../lib/callbacks';
 import { validateEmail } from '../../../../lib/emailValidator';
diff --git a/apps/meteor/client/views/setupWizard/steps/AdminInfoStep.tsx b/apps/meteor/client/views/setupWizard/steps/AdminInfoStep.tsx
index dfb468fb162..8da51ac859c 100644
--- a/apps/meteor/client/views/setupWizard/steps/AdminInfoStep.tsx
+++ b/apps/meteor/client/views/setupWizard/steps/AdminInfoStep.tsx
@@ -1,6 +1,7 @@
 import { AdminInfoPage } from '@rocket.chat/onboarding-ui';
 import { useSetting, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, ComponentProps } from 'react';
+import type { ReactElement, ComponentProps } from 'react';
+import React from 'react';
 
 import { useSetupWizardContext } from '../contexts/SetupWizardContext';
 
diff --git a/apps/meteor/client/views/setupWizard/steps/CloudAccountConfirmation.tsx b/apps/meteor/client/views/setupWizard/steps/CloudAccountConfirmation.tsx
index 535b5620f7c..3a9c7fbd577 100644
--- a/apps/meteor/client/views/setupWizard/steps/CloudAccountConfirmation.tsx
+++ b/apps/meteor/client/views/setupWizard/steps/CloudAccountConfirmation.tsx
@@ -1,6 +1,7 @@
 import { AwaitingConfirmationPage } from '@rocket.chat/onboarding-ui';
 import { useToastMessageDispatch, useSettingSetValue, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useEffect, useCallback } from 'react';
+import type { ReactElement } from 'react';
+import React, { useEffect, useCallback } from 'react';
 
 import { useSetupWizardContext } from '../contexts/SetupWizardContext';
 
diff --git a/apps/meteor/client/views/setupWizard/steps/OrganizationInfoStep.tsx b/apps/meteor/client/views/setupWizard/steps/OrganizationInfoStep.tsx
index 0917dcd1006..41a304db40e 100644
--- a/apps/meteor/client/views/setupWizard/steps/OrganizationInfoStep.tsx
+++ b/apps/meteor/client/views/setupWizard/steps/OrganizationInfoStep.tsx
@@ -1,7 +1,9 @@
 import type { ISetting } from '@rocket.chat/core-typings';
 import { OrganizationInfoPage } from '@rocket.chat/onboarding-ui';
-import { useRole, useTranslation, TranslationKey } from '@rocket.chat/ui-contexts';
-import React, { ComponentProps, ReactElement } from 'react';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useRole, useTranslation } from '@rocket.chat/ui-contexts';
+import type { ComponentProps, ReactElement } from 'react';
+import React from 'react';
 
 import { useSetupWizardContext } from '../contexts/SetupWizardContext';
 
diff --git a/apps/meteor/client/views/setupWizard/steps/RegisterServerStep.tsx b/apps/meteor/client/views/setupWizard/steps/RegisterServerStep.tsx
index 5221730d466..10dc50e154d 100644
--- a/apps/meteor/client/views/setupWizard/steps/RegisterServerStep.tsx
+++ b/apps/meteor/client/views/setupWizard/steps/RegisterServerStep.tsx
@@ -1,5 +1,6 @@
 import { RegisteredServerPage, StandaloneServerPage } from '@rocket.chat/onboarding-ui';
-import React, { ReactElement, ComponentProps, useState } from 'react';
+import type { ReactElement, ComponentProps } from 'react';
+import React, { useState } from 'react';
 
 import { useSetupWizardContext } from '../contexts/SetupWizardContext';
 
diff --git a/apps/meteor/client/views/teams/ChannelDesertionTable/ChannelDesertionTable.tsx b/apps/meteor/client/views/teams/ChannelDesertionTable/ChannelDesertionTable.tsx
index c7639c6e93e..8933a7aea26 100644
--- a/apps/meteor/client/views/teams/ChannelDesertionTable/ChannelDesertionTable.tsx
+++ b/apps/meteor/client/views/teams/ChannelDesertionTable/ChannelDesertionTable.tsx
@@ -1,8 +1,8 @@
-import type { IRoom } from '@rocket.chat/core-typings';
-import { Serialized } from '@rocket.chat/core-typings';
+import type { IRoom, Serialized } from '@rocket.chat/core-typings';
 import { Box, CheckBox } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, ReactElement, useMemo } from 'react';
+import type { FC, ReactElement } from 'react';
+import React, { useMemo } from 'react';
 
 import { GenericTable, GenericTableHeaderCell, GenericTableHeader, GenericTableBody } from '../../../components/GenericTable';
 import { useSort } from '../../../components/GenericTable/hooks/useSort';
diff --git a/apps/meteor/client/views/teams/ChannelDesertionTable/ChannelDesertionTableRow.tsx b/apps/meteor/client/views/teams/ChannelDesertionTable/ChannelDesertionTableRow.tsx
index ddeacaffcd0..068236076c0 100644
--- a/apps/meteor/client/views/teams/ChannelDesertionTable/ChannelDesertionTableRow.tsx
+++ b/apps/meteor/client/views/teams/ChannelDesertionTable/ChannelDesertionTableRow.tsx
@@ -1,7 +1,8 @@
-import { IRoom, Serialized } from '@rocket.chat/core-typings';
+import type { IRoom, Serialized } from '@rocket.chat/core-typings';
 import { CheckBox, TableRow, TableCell, Icon, Margins } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { useFormatDateAndTime } from '../../../hooks/useFormatDateAndTime';
 
diff --git a/apps/meteor/client/views/teams/ConvertToChannelModal/BaseConvertToChannelModal.tsx b/apps/meteor/client/views/teams/ConvertToChannelModal/BaseConvertToChannelModal.tsx
index 2bdd0abdd8b..7c1a17573b8 100644
--- a/apps/meteor/client/views/teams/ConvertToChannelModal/BaseConvertToChannelModal.tsx
+++ b/apps/meteor/client/views/teams/ConvertToChannelModal/BaseConvertToChannelModal.tsx
@@ -1,7 +1,7 @@
-import type { IRoom } from '@rocket.chat/core-typings';
-import { Serialized } from '@rocket.chat/core-typings';
+import type { IRoom, Serialized } from '@rocket.chat/core-typings';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import React, { FC, useState, useCallback } from 'react';
+import type { FC } from 'react';
+import React, { useState, useCallback } from 'react';
 
 import FirstStep from './ModalSteps/FirstStep';
 import SecondStep from './ModalSteps/SecondStep';
diff --git a/apps/meteor/client/views/teams/ConvertToChannelModal/ConvertToChannelModal.tsx b/apps/meteor/client/views/teams/ConvertToChannelModal/ConvertToChannelModal.tsx
index 422060b888a..ead17b84258 100644
--- a/apps/meteor/client/views/teams/ConvertToChannelModal/ConvertToChannelModal.tsx
+++ b/apps/meteor/client/views/teams/ConvertToChannelModal/ConvertToChannelModal.tsx
@@ -1,8 +1,8 @@
-import type { IRoom } from '@rocket.chat/core-typings';
-import { Serialized } from '@rocket.chat/core-typings';
+import type { IRoom, Serialized } from '@rocket.chat/core-typings';
 import { Skeleton } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, useMemo } from 'react';
+import type { FC } from 'react';
+import React, { useMemo } from 'react';
 
 import GenericModal from '../../../components/GenericModal';
 import { useEndpointData } from '../../../hooks/useEndpointData';
diff --git a/apps/meteor/client/views/teams/ConvertToChannelModal/ModalSteps/FirstStep.tsx b/apps/meteor/client/views/teams/ConvertToChannelModal/ModalSteps/FirstStep.tsx
index 3b375a1045a..b05a35e20ed 100644
--- a/apps/meteor/client/views/teams/ConvertToChannelModal/ModalSteps/FirstStep.tsx
+++ b/apps/meteor/client/views/teams/ConvertToChannelModal/ModalSteps/FirstStep.tsx
@@ -1,8 +1,8 @@
-import type { IRoom } from '@rocket.chat/core-typings';
-import { Serialized } from '@rocket.chat/core-typings';
+import type { IRoom, Serialized } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import GenericModal from '../../../../components/GenericModal';
 import ChannelDesertionTable from '../../ChannelDesertionTable';
diff --git a/apps/meteor/client/views/teams/ConvertToChannelModal/ModalSteps/SecondStep.tsx b/apps/meteor/client/views/teams/ConvertToChannelModal/ModalSteps/SecondStep.tsx
index 5e72dbfd075..9767b52ef37 100644
--- a/apps/meteor/client/views/teams/ConvertToChannelModal/ModalSteps/SecondStep.tsx
+++ b/apps/meteor/client/views/teams/ConvertToChannelModal/ModalSteps/SecondStep.tsx
@@ -1,8 +1,8 @@
-import type { IRoom } from '@rocket.chat/core-typings';
-import { Serialized } from '@rocket.chat/core-typings';
+import type { IRoom, Serialized } from '@rocket.chat/core-typings';
 import { Icon } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import GenericModal from '../../../../components/GenericModal';
 
diff --git a/apps/meteor/client/views/teams/contextualBar/channels/AddExistingModal/AddExistingModal.tsx b/apps/meteor/client/views/teams/contextualBar/channels/AddExistingModal/AddExistingModal.tsx
index d55ac94cfde..edad41b112b 100644
--- a/apps/meteor/client/views/teams/contextualBar/channels/AddExistingModal/AddExistingModal.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/channels/AddExistingModal/AddExistingModal.tsx
@@ -1,8 +1,8 @@
-import type { IRoom } from '@rocket.chat/core-typings';
-import { Serialized } from '@rocket.chat/core-typings';
+import type { IRoom, Serialized } from '@rocket.chat/core-typings';
 import { Button, Field, Modal } from '@rocket.chat/fuselage';
 import { useToastMessageDispatch, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { memo, FC, useCallback } from 'react';
+import type { FC } from 'react';
+import React, { memo, useCallback } from 'react';
 
 import { useForm } from '../../../../../hooks/useForm';
 import RoomsInput from './RoomsInput';
diff --git a/apps/meteor/client/views/teams/contextualBar/channels/AddExistingModal/RoomsInput.tsx b/apps/meteor/client/views/teams/contextualBar/channels/AddExistingModal/RoomsInput.tsx
index 3d2f6339976..b3f7f0efbbb 100644
--- a/apps/meteor/client/views/teams/contextualBar/channels/AddExistingModal/RoomsInput.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/channels/AddExistingModal/RoomsInput.tsx
@@ -1,8 +1,9 @@
-import type { IRoom } from '@rocket.chat/core-typings';
-import { Serialized } from '@rocket.chat/core-typings';
-import { AutoComplete, Box, Icon, Option, Options, Chip, AutoCompleteProps } from '@rocket.chat/fuselage';
+import type { IRoom, Serialized } from '@rocket.chat/core-typings';
+import type { AutoCompleteProps } from '@rocket.chat/fuselage';
+import { AutoComplete, Box, Icon, Option, Options, Chip } from '@rocket.chat/fuselage';
 import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
-import React, { FC, memo, useCallback, useMemo, useState } from 'react';
+import type { FC } from 'react';
+import React, { memo, useCallback, useMemo, useState } from 'react';
 
 import RoomAvatar from '../../../../../components/avatar/RoomAvatar';
 import { useEndpointData } from '../../../../../hooks/useEndpointData';
diff --git a/apps/meteor/client/views/teams/contextualBar/channels/ConfirmationModal/ConfirmationModal.tsx b/apps/meteor/client/views/teams/contextualBar/channels/ConfirmationModal/ConfirmationModal.tsx
index 32aa786f601..85a0665b57b 100644
--- a/apps/meteor/client/views/teams/contextualBar/channels/ConfirmationModal/ConfirmationModal.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/channels/ConfirmationModal/ConfirmationModal.tsx
@@ -1,6 +1,7 @@
 import { Button, Modal } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { memo, FC } from 'react';
+import type { FC } from 'react';
+import React, { memo } from 'react';
 
 type ConfirmationModalProps = {
 	onClose: () => void;
diff --git a/apps/meteor/client/views/teams/contextualBar/channels/tabBar.ts b/apps/meteor/client/views/teams/contextualBar/channels/tabBar.ts
index 83461a038fc..259585149b7 100644
--- a/apps/meteor/client/views/teams/contextualBar/channels/tabBar.ts
+++ b/apps/meteor/client/views/teams/contextualBar/channels/tabBar.ts
@@ -1,4 +1,5 @@
-import { FC, lazy, LazyExoticComponent } from 'react';
+import type { FC, LazyExoticComponent } from 'react';
+import { lazy } from 'react';
 
 import { addAction } from '../../../room/lib/Toolbox';
 
diff --git a/apps/meteor/client/views/teams/contextualBar/info/Delete/DeleteTeamModal.stories.tsx b/apps/meteor/client/views/teams/contextualBar/info/Delete/DeleteTeamModal.stories.tsx
index d0911836922..c6f7a0f305a 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/Delete/DeleteTeamModal.stories.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/Delete/DeleteTeamModal.stories.tsx
@@ -1,5 +1,5 @@
 import { action } from '@storybook/addon-actions';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import DeleteTeamModal from '.';
diff --git a/apps/meteor/client/views/teams/contextualBar/info/Delete/DeleteTeamModalWithRooms.tsx b/apps/meteor/client/views/teams/contextualBar/info/Delete/DeleteTeamModalWithRooms.tsx
index 48e9b34a141..6c20fa0de02 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/Delete/DeleteTeamModalWithRooms.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/Delete/DeleteTeamModalWithRooms.tsx
@@ -1,7 +1,8 @@
-import { IRoom } from '@rocket.chat/core-typings';
+import type { IRoom } from '@rocket.chat/core-typings';
 import { Skeleton } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useMemo, ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo } from 'react';
 
 import GenericModal from '../../../../../components/GenericModal';
 import { AsyncStatePhase } from '../../../../../hooks/useAsyncState';
diff --git a/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamModal/LeaveTeamModal.stories.tsx b/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamModal/LeaveTeamModal.stories.tsx
index ab6785c0318..8e9d037a726 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamModal/LeaveTeamModal.stories.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamModal/LeaveTeamModal.stories.tsx
@@ -1,5 +1,5 @@
 import { action } from '@storybook/addon-actions';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import LeaveTeamModal from './LeaveTeamModal';
diff --git a/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamModal/LeaveTeamModal.tsx b/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamModal/LeaveTeamModal.tsx
index 504732e13d6..2191593b8ce 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamModal/LeaveTeamModal.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamModal/LeaveTeamModal.tsx
@@ -1,6 +1,7 @@
-import { IRoom, Serialized } from '@rocket.chat/core-typings';
+import type { IRoom, Serialized } from '@rocket.chat/core-typings';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import React, { useState, useCallback, ReactElement, useMemo } from 'react';
+import type { ReactElement } from 'react';
+import React, { useState, useCallback, useMemo } from 'react';
 
 import LeaveTeamModalChannels from './LeaveTeamModalChannels';
 import LeaveTeamModalConfirmation from './LeaveTeamModalConfirmation';
diff --git a/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamModal/LeaveTeamModalChannels.tsx b/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamModal/LeaveTeamModalChannels.tsx
index a0f678dfec3..0a4b0fbe6af 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamModal/LeaveTeamModalChannels.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamModal/LeaveTeamModalChannels.tsx
@@ -1,6 +1,7 @@
-import { IRoom, Serialized } from '@rocket.chat/core-typings';
+import type { IRoom, Serialized } from '@rocket.chat/core-typings';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import GenericModal from '../../../../../../components/GenericModal';
 import ChannelDesertionTable from '../../../../ChannelDesertionTable';
diff --git a/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamModal/LeaveTeamModalConfirmation.tsx b/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamModal/LeaveTeamModalConfirmation.tsx
index ca1a07ca7c8..36ef2c54f4b 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamModal/LeaveTeamModalConfirmation.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamModal/LeaveTeamModalConfirmation.tsx
@@ -1,6 +1,7 @@
-import { IRoom, Serialized } from '@rocket.chat/core-typings';
+import type { IRoom, Serialized } from '@rocket.chat/core-typings';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import GenericModal from '../../../../../../components/GenericModal';
 
diff --git a/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamWithData.tsx b/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamWithData.tsx
index c812bcc2665..9bab0acc3d8 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamWithData.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamWithData.tsx
@@ -1,8 +1,9 @@
-import { ITeam } from '@rocket.chat/core-typings';
+import type { ITeam } from '@rocket.chat/core-typings';
 import { Skeleton } from '@rocket.chat/fuselage';
 import { useUserId, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import GenericModal from '../../../../../components/GenericModal';
 import LeaveTeamModal from './LeaveTeamModal/LeaveTeamModal';
diff --git a/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.stories.tsx b/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.stories.tsx
index e8cc095c134..cd45b91c44a 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.stories.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.stories.tsx
@@ -1,5 +1,5 @@
-import { IRoom } from '@rocket.chat/core-typings';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { IRoom } from '@rocket.chat/core-typings';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import VerticalBar from '../../../../components/VerticalBar';
diff --git a/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.tsx b/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.tsx
index 27acd9ef78a..36b8cc0391d 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.tsx
@@ -1,14 +1,17 @@
-import { IRoom } from '@rocket.chat/core-typings';
-import { Box, Button, Callout, Option, Menu, Icon } from '@rocket.chat/fuselage';
+import type { IRoom } from '@rocket.chat/core-typings';
+import type { Icon } from '@rocket.chat/fuselage';
+import { Box, Button, Callout, Option, Menu } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useMemo, ComponentProps } from 'react';
+import type { ReactElement, ComponentProps } from 'react';
+import React, { useMemo } from 'react';
 
 import InfoPanel from '../../../../components/InfoPanel';
 import RetentionPolicyCallout from '../../../../components/InfoPanel/RetentionPolicyCallout';
 import MarkdownText from '../../../../components/MarkdownText';
 import VerticalBar from '../../../../components/VerticalBar';
 import RoomAvatar from '../../../../components/avatar/RoomAvatar';
-import { useActionSpread, Action } from '../../../hooks/useActionSpread';
+import type { Action } from '../../../hooks/useActionSpread';
+import { useActionSpread } from '../../../hooks/useActionSpread';
 
 type RetentionPolicy = {
 	retentionPolicyEnabled: boolean;
diff --git a/apps/meteor/client/views/teams/contextualBar/info/tabBar.ts b/apps/meteor/client/views/teams/contextualBar/info/tabBar.ts
index 7a30be58b54..d7da8f3ec9c 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/tabBar.ts
+++ b/apps/meteor/client/views/teams/contextualBar/info/tabBar.ts
@@ -1,4 +1,5 @@
-import { FC, lazy, LazyExoticComponent } from 'react';
+import type { FC, LazyExoticComponent } from 'react';
+import { lazy } from 'react';
 
 import { addAction } from '../../../room/lib/Toolbox';
 
diff --git a/apps/meteor/ee/client/audit/AuditLogPage.tsx b/apps/meteor/ee/client/audit/AuditLogPage.tsx
index 6f802aab41b..d0b0552d3c2 100644
--- a/apps/meteor/ee/client/audit/AuditLogPage.tsx
+++ b/apps/meteor/ee/client/audit/AuditLogPage.tsx
@@ -1,7 +1,8 @@
 import { Field } from '@rocket.chat/fuselage';
 import { useMethod, useTranslation } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
-import React, { ReactElement, useState } from 'react';
+import type { ReactElement } from 'react';
+import React, { useState } from 'react';
 
 import Page from '../../../client/components/Page';
 import AuditLogTable from './AuditLogTable';
diff --git a/apps/meteor/ee/client/audit/AuditPage.stories.tsx b/apps/meteor/ee/client/audit/AuditPage.stories.tsx
index b65c5559a6c..0cdd8f7c979 100644
--- a/apps/meteor/ee/client/audit/AuditPage.stories.tsx
+++ b/apps/meteor/ee/client/audit/AuditPage.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import AuditPage from './AuditPage';
diff --git a/apps/meteor/ee/client/audit/DateRangePicker.tsx b/apps/meteor/ee/client/audit/DateRangePicker.tsx
index eaf12f47272..985ea9d94d6 100644
--- a/apps/meteor/ee/client/audit/DateRangePicker.tsx
+++ b/apps/meteor/ee/client/audit/DateRangePicker.tsx
@@ -1,7 +1,8 @@
 import { Box, InputBox, Menu, Margins } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useState, useMemo, useEffect, ReactElement, ComponentProps } from 'react';
+import type { ReactElement, ComponentProps } from 'react';
+import React, { useState, useMemo, useEffect } from 'react';
 
 const date = new Date();
 
diff --git a/apps/meteor/ee/client/components/deviceManagement/LoggedOutBanner.tsx b/apps/meteor/ee/client/components/deviceManagement/LoggedOutBanner.tsx
index 32e6add40f8..965ad798b4b 100644
--- a/apps/meteor/ee/client/components/deviceManagement/LoggedOutBanner.tsx
+++ b/apps/meteor/ee/client/components/deviceManagement/LoggedOutBanner.tsx
@@ -1,6 +1,7 @@
 import { Banner, Box, Icon } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 const LoggedOutBanner = (): ReactElement => {
 	const t = useTranslation();
diff --git a/apps/meteor/ee/client/deviceManagement/components/DeviceIcon.tsx b/apps/meteor/ee/client/deviceManagement/components/DeviceIcon.tsx
index 58a12b8acb5..4461a6d38ec 100644
--- a/apps/meteor/ee/client/deviceManagement/components/DeviceIcon.tsx
+++ b/apps/meteor/ee/client/deviceManagement/components/DeviceIcon.tsx
@@ -1,5 +1,6 @@
 import { Box, Icon } from '@rocket.chat/fuselage';
-import React, { ComponentProps, ReactElement } from 'react';
+import type { ComponentProps, ReactElement } from 'react';
+import React from 'react';
 
 const iconMap: Record<string, ComponentProps<typeof Icon>['name']> = {
 	'browser': 'desktop',
diff --git a/apps/meteor/ee/client/deviceManagement/components/DeviceManagementTable/DeviceManagementTable.tsx b/apps/meteor/ee/client/deviceManagement/components/DeviceManagementTable/DeviceManagementTable.tsx
index 8ddd890c5f0..75c2ff25dc3 100644
--- a/apps/meteor/ee/client/deviceManagement/components/DeviceManagementTable/DeviceManagementTable.tsx
+++ b/apps/meteor/ee/client/deviceManagement/components/DeviceManagementTable/DeviceManagementTable.tsx
@@ -1,8 +1,9 @@
-import { DeviceManagementSession, DeviceManagementPopulatedSession, Serialized } from '@rocket.chat/core-typings';
+import type { DeviceManagementSession, DeviceManagementPopulatedSession, Serialized } from '@rocket.chat/core-typings';
 import { Box, Pagination, States, StatesAction, StatesActions, StatesIcon, StatesSubtitle, StatesTitle } from '@rocket.chat/fuselage';
-import { PaginatedResult } from '@rocket.chat/rest-typings';
+import type { PaginatedResult } from '@rocket.chat/rest-typings';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ComponentProps, ReactElement } from 'react';
+import type { ComponentProps, ReactElement } from 'react';
+import React from 'react';
 
 import {
 	GenericTable,
diff --git a/apps/meteor/ee/client/hooks/useDevicesMenuOption.tsx b/apps/meteor/ee/client/hooks/useDevicesMenuOption.tsx
index 16c00c9c8b5..8aad7f7f99e 100644
--- a/apps/meteor/ee/client/hooks/useDevicesMenuOption.tsx
+++ b/apps/meteor/ee/client/hooks/useDevicesMenuOption.tsx
@@ -1,6 +1,7 @@
 import { Box, Icon } from '@rocket.chat/fuselage';
 import { useSetModal, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactNode } from 'react';
+import type { ReactNode } from 'react';
+import React from 'react';
 
 import DeviceSettingsModal from '../voip/modals/DeviceSettingsModal';
 import { useHasLicenseModule } from './useHasLicenseModule';
diff --git a/apps/meteor/ee/client/hooks/useHasLicenseModule.ts b/apps/meteor/ee/client/hooks/useHasLicenseModule.ts
index 4fb28f5662a..5c1ea7cab3b 100644
--- a/apps/meteor/ee/client/hooks/useHasLicenseModule.ts
+++ b/apps/meteor/ee/client/hooks/useHasLicenseModule.ts
@@ -1,7 +1,7 @@
 import { useState, useEffect } from 'react';
 
 import { hasLicense } from '../../app/license/client';
-import { BundleFeature } from '../../app/license/server/bundles';
+import type { BundleFeature } from '../../app/license/server/bundles';
 
 export const useHasLicenseModule = (licenseName: BundleFeature): 'loading' | boolean => {
 	const [license, setLicense] = useState<'loading' | boolean>('loading');
diff --git a/apps/meteor/ee/client/hooks/useVoipClient.ts b/apps/meteor/ee/client/hooks/useVoipClient.ts
index eab2b66993a..93048c50016 100644
--- a/apps/meteor/ee/client/hooks/useVoipClient.ts
+++ b/apps/meteor/ee/client/hooks/useVoipClient.ts
@@ -1,4 +1,5 @@
-import { IRegistrationInfo, WorkflowTypes } from '@rocket.chat/core-typings';
+import type { IRegistrationInfo } from '@rocket.chat/core-typings';
+import { WorkflowTypes } from '@rocket.chat/core-typings';
 import { useSafely } from '@rocket.chat/fuselage-hooks';
 import { useUser, useSetting, useEndpoint, useStream } from '@rocket.chat/ui-contexts';
 import { KJUR } from 'jsrsasign';
diff --git a/apps/meteor/ee/client/hooks/useVoipFooterMenu.tsx b/apps/meteor/ee/client/hooks/useVoipFooterMenu.tsx
index b342e733a92..79a50c4ce50 100644
--- a/apps/meteor/ee/client/hooks/useVoipFooterMenu.tsx
+++ b/apps/meteor/ee/client/hooks/useVoipFooterMenu.tsx
@@ -1,4 +1,5 @@
-import { ReactNode, useMemo } from 'react';
+import type { ReactNode } from 'react';
+import { useMemo } from 'react';
 
 import { useDevicesMenuOption } from './useDevicesMenuOption';
 
diff --git a/apps/meteor/ee/client/lib/voip/EEVoipClient.ts b/apps/meteor/ee/client/lib/voip/EEVoipClient.ts
index 6d0f4b5b9b2..6afa5b2a683 100644
--- a/apps/meteor/ee/client/lib/voip/EEVoipClient.ts
+++ b/apps/meteor/ee/client/lib/voip/EEVoipClient.ts
@@ -1,6 +1,7 @@
-import { ICallerInfo, IMediaStreamRenderer, Operation, UserState, VoIPUserConfiguration } from '@rocket.chat/core-typings';
+import type { ICallerInfo, IMediaStreamRenderer, VoIPUserConfiguration } from '@rocket.chat/core-typings';
+import { Operation, UserState } from '@rocket.chat/core-typings';
 import { Inviter, UserAgent } from 'sip.js';
-import { IncomingResponse } from 'sip.js/lib/core';
+import type { IncomingResponse } from 'sip.js/lib/core';
 
 import { VoIPUser } from '../../../../client/lib/voip/VoIPUser';
 
diff --git a/apps/meteor/ee/client/omnichannel/BusinessHoursTable.stories.tsx b/apps/meteor/ee/client/omnichannel/BusinessHoursTable.stories.tsx
index ca4059b659f..09c720fddd2 100644
--- a/apps/meteor/ee/client/omnichannel/BusinessHoursTable.stories.tsx
+++ b/apps/meteor/ee/client/omnichannel/BusinessHoursTable.stories.tsx
@@ -1,5 +1,5 @@
 import { Box } from '@rocket.chat/fuselage';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import BusinessHoursTable from './BusinessHoursTable';
diff --git a/apps/meteor/ee/client/omnichannel/additionalForms/BusinessHoursMultiple.stories.tsx b/apps/meteor/ee/client/omnichannel/additionalForms/BusinessHoursMultiple.stories.tsx
index 2601427f57d..0bb12748db7 100644
--- a/apps/meteor/ee/client/omnichannel/additionalForms/BusinessHoursMultiple.stories.tsx
+++ b/apps/meteor/ee/client/omnichannel/additionalForms/BusinessHoursMultiple.stories.tsx
@@ -1,5 +1,5 @@
 import { Box, Skeleton } from '@rocket.chat/fuselage';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import BusinessHoursMultiple from './BusinessHoursMultiple';
diff --git a/apps/meteor/ee/client/omnichannel/additionalForms/BusinessHoursTimeZone.stories.tsx b/apps/meteor/ee/client/omnichannel/additionalForms/BusinessHoursTimeZone.stories.tsx
index c6a7602d2e4..21c237d8468 100644
--- a/apps/meteor/ee/client/omnichannel/additionalForms/BusinessHoursTimeZone.stories.tsx
+++ b/apps/meteor/ee/client/omnichannel/additionalForms/BusinessHoursTimeZone.stories.tsx
@@ -1,5 +1,5 @@
 import { Box } from '@rocket.chat/fuselage';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import BusinessHoursTimeZone from './BusinessHoursTimeZone';
diff --git a/apps/meteor/ee/client/omnichannel/additionalForms/MaxChatsPerAgent.tsx b/apps/meteor/ee/client/omnichannel/additionalForms/MaxChatsPerAgent.tsx
index fb4304a20ff..924305e947f 100644
--- a/apps/meteor/ee/client/omnichannel/additionalForms/MaxChatsPerAgent.tsx
+++ b/apps/meteor/ee/client/omnichannel/additionalForms/MaxChatsPerAgent.tsx
@@ -1,6 +1,7 @@
 import { NumberInput, Field } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 const MaxChatsPerAgent: FC<{
 	values: { maxNumberSimultaneousChat: number };
diff --git a/apps/meteor/ee/client/omnichannel/additionalForms/register.ts b/apps/meteor/ee/client/omnichannel/additionalForms/register.ts
index a230ca84471..03c0de294a6 100644
--- a/apps/meteor/ee/client/omnichannel/additionalForms/register.ts
+++ b/apps/meteor/ee/client/omnichannel/additionalForms/register.ts
@@ -1,4 +1,5 @@
-import { useMemo, lazy, LazyExoticComponent } from 'react';
+import type { LazyExoticComponent } from 'react';
+import { useMemo, lazy } from 'react';
 
 import type AutoCompleteDepartment from '../../../../client/components/AutoCompleteDepartment';
 import { registerForm } from '../../../../client/views/omnichannel/additionalForms';
@@ -18,6 +19,7 @@ import type MaxChatsPerAgentDisplay from './MaxChatsPerAgentDisplay';
 import type PrioritiesSelect from './PrioritiesSelect';
 
 declare module '../../../../client/views/omnichannel/additionalForms' {
+	// eslint-disable-next-line @typescript-eslint/naming-convention
 	interface EEFormHooks {
 		useCustomFieldsAdditionalForm: () => LazyExoticComponent<typeof CustomFieldsAdditionalFormContainer>;
 		useMaxChatsPerAgent?: () => LazyExoticComponent<typeof MaxChatsPerAgentContainer>;
diff --git a/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponseEdit.tsx b/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponseEdit.tsx
index 149c0b63c0a..b8d70706c14 100644
--- a/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponseEdit.tsx
+++ b/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponseEdit.tsx
@@ -1,9 +1,9 @@
-import type { ILivechatDepartment, IOmnichannelCannedResponse } from '@rocket.chat/core-typings';
-import { Serialized } from '@rocket.chat/core-typings';
+import type { ILivechatDepartment, IOmnichannelCannedResponse, Serialized } from '@rocket.chat/core-typings';
 import { Button, ButtonGroup, Icon, FieldGroup } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useToastMessageDispatch, useRoute, usePermission, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, memo, useState, useMemo, useEffect, useCallback } from 'react';
+import type { FC } from 'react';
+import React, { memo, useState, useMemo, useEffect, useCallback } from 'react';
 
 import Page from '../../../../client/components/Page';
 import { useForm } from '../../../../client/hooks/useForm';
diff --git a/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponseEditWithData.tsx b/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponseEditWithData.tsx
index 4625845fea3..4e032dc460c 100644
--- a/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponseEditWithData.tsx
+++ b/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponseEditWithData.tsx
@@ -1,6 +1,7 @@
 import { Callout } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import { FormSkeleton } from '../../../../client/components/Skeleton';
 import { AsyncStatePhase } from '../../../../client/hooks/useAsyncState';
diff --git a/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponseEditWithDepartmentData.tsx b/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponseEditWithDepartmentData.tsx
index 6ae941d18c5..2cc07e84b39 100644
--- a/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponseEditWithDepartmentData.tsx
+++ b/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponseEditWithDepartmentData.tsx
@@ -1,8 +1,8 @@
-import type { IOmnichannelCannedResponse } from '@rocket.chat/core-typings';
-import { Serialized } from '@rocket.chat/core-typings';
+import type { IOmnichannelCannedResponse, Serialized } from '@rocket.chat/core-typings';
 import { Callout } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useMemo, FC } from 'react';
+import type { FC } from 'react';
+import React, { useMemo } from 'react';
 
 import { FormSkeleton } from '../../../../client/components/Skeleton';
 import { AsyncStatePhase } from '../../../../client/hooks/useAsyncState';
diff --git a/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponseFilter.tsx b/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponseFilter.tsx
index 3ccbc77dc1a..4ad94a449d6 100644
--- a/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponseFilter.tsx
+++ b/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponseFilter.tsx
@@ -1,6 +1,8 @@
-import { Box, Icon, TextInput, Select, SelectOption } from '@rocket.chat/fuselage';
+import type { SelectOption } from '@rocket.chat/fuselage';
+import { Box, Icon, TextInput, Select } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, FormEvent, memo, useCallback } from 'react';
+import type { FC, FormEvent } from 'react';
+import React, { memo, useCallback } from 'react';
 
 import AutoCompleteAgent from '../../../../client/components/AutoCompleteAgent';
 
diff --git a/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponseNew.tsx b/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponseNew.tsx
index 66e6c9c4a77..8154b44adcb 100644
--- a/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponseNew.tsx
+++ b/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponseNew.tsx
@@ -1,4 +1,5 @@
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import CannedResponseEdit from './CannedResponseEdit';
 
diff --git a/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponsesPage.tsx b/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponsesPage.tsx
index d4344db0bb7..71b0e1df2b7 100644
--- a/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponsesPage.tsx
+++ b/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponsesPage.tsx
@@ -1,7 +1,8 @@
 import { Button, Icon, ButtonGroup } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useRoute, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, ReactElement, Dispatch, SetStateAction } from 'react';
+import type { FC, ReactElement, Dispatch, SetStateAction } from 'react';
+import React from 'react';
 
 import GenericTable from '../../../../client/components/GenericTable';
 import NoResults from '../../../../client/components/GenericTable/NoResults';
diff --git a/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponsesRoute.tsx b/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponsesRoute.tsx
index 08b26bb1b08..9c6b1480cfb 100644
--- a/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponsesRoute.tsx
+++ b/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponsesRoute.tsx
@@ -1,7 +1,8 @@
 import { Table, Box } from '@rocket.chat/fuselage';
 import { useDebouncedValue, useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useToastMessageDispatch, useRouteParameter, useRoute, usePermission, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useMemo, useCallback, useState, FC, ReactElement } from 'react';
+import type { FC, ReactElement } from 'react';
+import React, { useMemo, useCallback, useState } from 'react';
 
 import GenericTable from '../../../../client/components/GenericTable';
 import PageSkeleton from '../../../../client/components/PageSkeleton';
diff --git a/apps/meteor/ee/client/omnichannel/cannedResponses/RemoveCannedResponseButton.tsx b/apps/meteor/ee/client/omnichannel/cannedResponses/RemoveCannedResponseButton.tsx
index bca0dfee02f..f8d29d08319 100644
--- a/apps/meteor/ee/client/omnichannel/cannedResponses/RemoveCannedResponseButton.tsx
+++ b/apps/meteor/ee/client/omnichannel/cannedResponses/RemoveCannedResponseButton.tsx
@@ -1,7 +1,8 @@
 import { Table, IconButton } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useSetModal, useToastMessageDispatch, useRoute, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import GenericModal from '../../../../client/components/GenericModal';
 
diff --git a/apps/meteor/ee/client/omnichannel/cannedResponses/components/cannedResponseForm.tsx b/apps/meteor/ee/client/omnichannel/cannedResponses/components/cannedResponseForm.tsx
index 10325606008..748a6ba905a 100644
--- a/apps/meteor/ee/client/omnichannel/cannedResponses/components/cannedResponseForm.tsx
+++ b/apps/meteor/ee/client/omnichannel/cannedResponses/components/cannedResponseForm.tsx
@@ -1,7 +1,8 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Field, TextInput } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import AutoCompleteDepartment from '../../../../../client/components/AutoCompleteDepartment';
 import Tags from '../../../../../client/components/Omnichannel/Tags';
diff --git a/apps/meteor/ee/client/omnichannel/components/CannedResponse/MarkdownTextEditor/InsertPlaceholderDropdown.tsx b/apps/meteor/ee/client/omnichannel/components/CannedResponse/MarkdownTextEditor/InsertPlaceholderDropdown.tsx
index a1dcfda0739..72b0b00939c 100644
--- a/apps/meteor/ee/client/omnichannel/components/CannedResponse/MarkdownTextEditor/InsertPlaceholderDropdown.tsx
+++ b/apps/meteor/ee/client/omnichannel/components/CannedResponse/MarkdownTextEditor/InsertPlaceholderDropdown.tsx
@@ -1,7 +1,8 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Divider } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { Dispatch, FC, memo, RefObject, SetStateAction } from 'react';
+import type { Dispatch, FC, RefObject, SetStateAction } from 'react';
+import React, { memo } from 'react';
 
 const InsertPlaceholderDropdown: FC<{
 	onChange: any;
diff --git a/apps/meteor/ee/client/omnichannel/components/CannedResponse/MarkdownTextEditor/MarkdownTextEditor.stories.tsx b/apps/meteor/ee/client/omnichannel/components/CannedResponse/MarkdownTextEditor/MarkdownTextEditor.stories.tsx
index 1abfc487f37..9923fbf5e7c 100644
--- a/apps/meteor/ee/client/omnichannel/components/CannedResponse/MarkdownTextEditor/MarkdownTextEditor.stories.tsx
+++ b/apps/meteor/ee/client/omnichannel/components/CannedResponse/MarkdownTextEditor/MarkdownTextEditor.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import MarkdownTextEditor from '.';
diff --git a/apps/meteor/ee/client/omnichannel/components/CannedResponse/MarkdownTextEditor/index.tsx b/apps/meteor/ee/client/omnichannel/components/CannedResponse/MarkdownTextEditor/index.tsx
index 5e4a0a2cfd2..3ea1e5cf524 100644
--- a/apps/meteor/ee/client/omnichannel/components/CannedResponse/MarkdownTextEditor/index.tsx
+++ b/apps/meteor/ee/client/omnichannel/components/CannedResponse/MarkdownTextEditor/index.tsx
@@ -1,6 +1,7 @@
 import { Box, Divider, PositionAnimated, Tile } from '@rocket.chat/fuselage';
 import { useUserPreference, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, memo, useCallback, useRef, useState } from 'react';
+import type { FC } from 'react';
+import React, { memo, useCallback, useRef, useState } from 'react';
 
 import { EmojiPicker } from '../../../../../../app/emoji/client';
 import { Backdrop } from '../../../../../../client/components/Backdrop';
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 dcea1d89fee..155994d6e2a 100644
--- a/apps/meteor/ee/client/omnichannel/components/CannedResponse/TextEditor/IconButton.tsx
+++ b/apps/meteor/ee/client/omnichannel/components/CannedResponse/TextEditor/IconButton.tsx
@@ -1,5 +1,6 @@
 import { IconButton as Icon } from '@rocket.chat/fuselage';
-import React, { ComponentProps, memo, ReactElement } from 'react';
+import type { ComponentProps, ReactElement } from 'react';
+import React, { memo } from 'react';
 
 type IconButtonProps = {
 	name: ComponentProps<typeof Icon>['icon'];
diff --git a/apps/meteor/ee/client/omnichannel/components/CannedResponse/TextEditor/TextButton.tsx b/apps/meteor/ee/client/omnichannel/components/CannedResponse/TextEditor/TextButton.tsx
index 280dd87bc0f..d980ff7a595 100644
--- a/apps/meteor/ee/client/omnichannel/components/CannedResponse/TextEditor/TextButton.tsx
+++ b/apps/meteor/ee/client/omnichannel/components/CannedResponse/TextEditor/TextButton.tsx
@@ -1,5 +1,6 @@
 import { Button } from '@rocket.chat/fuselage';
-import { TranslationKey, useTranslation } from '@rocket.chat/ui-contexts';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { forwardRef, memo } from 'react';
 
 type TextButtonProps = {
diff --git a/apps/meteor/ee/client/omnichannel/components/CannedResponse/TextEditor/TextEditor.stories.tsx b/apps/meteor/ee/client/omnichannel/components/CannedResponse/TextEditor/TextEditor.stories.tsx
index f59367cc063..c7604c045a9 100644
--- a/apps/meteor/ee/client/omnichannel/components/CannedResponse/TextEditor/TextEditor.stories.tsx
+++ b/apps/meteor/ee/client/omnichannel/components/CannedResponse/TextEditor/TextEditor.stories.tsx
@@ -1,5 +1,5 @@
 import { Divider } from '@rocket.chat/fuselage';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React, { useRef } from 'react';
 
 import TextEditor from '.';
diff --git a/apps/meteor/ee/client/omnichannel/components/CannedResponse/TextEditor/Textarea.tsx b/apps/meteor/ee/client/omnichannel/components/CannedResponse/TextEditor/Textarea.tsx
index 6307c1bf8c5..518628fa202 100644
--- a/apps/meteor/ee/client/omnichannel/components/CannedResponse/TextEditor/Textarea.tsx
+++ b/apps/meteor/ee/client/omnichannel/components/CannedResponse/TextEditor/Textarea.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { ComponentProps, forwardRef } from 'react';
+import type { ComponentProps } from 'react';
+import React, { forwardRef } from 'react';
 
 type TextareaProps = ComponentProps<typeof Box>;
 
diff --git a/apps/meteor/ee/client/omnichannel/components/CannedResponse/TextEditor/Toolbox.tsx b/apps/meteor/ee/client/omnichannel/components/CannedResponse/TextEditor/Toolbox.tsx
index 3475202b417..436c5305818 100644
--- a/apps/meteor/ee/client/omnichannel/components/CannedResponse/TextEditor/Toolbox.tsx
+++ b/apps/meteor/ee/client/omnichannel/components/CannedResponse/TextEditor/Toolbox.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import IconButton from './IconButton';
 import TextButton from './TextButton';
diff --git a/apps/meteor/ee/client/omnichannel/components/CannedResponse/TextEditor/index.tsx b/apps/meteor/ee/client/omnichannel/components/CannedResponse/TextEditor/index.tsx
index 728a1e113c7..c9c54378515 100644
--- a/apps/meteor/ee/client/omnichannel/components/CannedResponse/TextEditor/index.tsx
+++ b/apps/meteor/ee/client/omnichannel/components/CannedResponse/TextEditor/index.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import Textarea from './Textarea';
 import Toolbox from './Toolbox';
diff --git a/apps/meteor/ee/client/omnichannel/components/CannedResponse/modals/CreateCannedResponse/CreateCannedResponseModal.stories.tsx b/apps/meteor/ee/client/omnichannel/components/CannedResponse/modals/CreateCannedResponse/CreateCannedResponseModal.stories.tsx
index 308c2c597f1..4bc899cdf69 100644
--- a/apps/meteor/ee/client/omnichannel/components/CannedResponse/modals/CreateCannedResponse/CreateCannedResponseModal.stories.tsx
+++ b/apps/meteor/ee/client/omnichannel/components/CannedResponse/modals/CreateCannedResponse/CreateCannedResponseModal.stories.tsx
@@ -1,5 +1,5 @@
 import { action } from '@storybook/addon-actions';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import CreateCannedResponseModal from './CreateCannedResponseModal';
diff --git a/apps/meteor/ee/client/omnichannel/components/CannedResponse/modals/CreateCannedResponse/CreateCannedResponseModal.tsx b/apps/meteor/ee/client/omnichannel/components/CannedResponse/modals/CreateCannedResponse/CreateCannedResponseModal.tsx
index 566d3d5cb7f..55bab0c2ab7 100644
--- a/apps/meteor/ee/client/omnichannel/components/CannedResponse/modals/CreateCannedResponse/CreateCannedResponseModal.tsx
+++ b/apps/meteor/ee/client/omnichannel/components/CannedResponse/modals/CreateCannedResponse/CreateCannedResponseModal.tsx
@@ -1,6 +1,7 @@
 import { Button, Modal } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, memo, ReactNode } from 'react';
+import type { FC, ReactNode } from 'react';
+import React, { memo } from 'react';
 
 import CannedResponseForm from '../../../../cannedResponses/components/cannedResponseForm';
 
diff --git a/apps/meteor/ee/client/omnichannel/components/CannedResponse/modals/CreateCannedResponse/PreviewText.tsx b/apps/meteor/ee/client/omnichannel/components/CannedResponse/modals/CreateCannedResponse/PreviewText.tsx
index 38d1d991637..de570a7a9b7 100644
--- a/apps/meteor/ee/client/omnichannel/components/CannedResponse/modals/CreateCannedResponse/PreviewText.tsx
+++ b/apps/meteor/ee/client/omnichannel/components/CannedResponse/modals/CreateCannedResponse/PreviewText.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { FC, memo } from 'react';
+import type { FC } from 'react';
+import React, { memo } from 'react';
 
 import MarkdownText from '../../../../../../../client/components/MarkdownText';
 
diff --git a/apps/meteor/ee/client/omnichannel/components/CannedResponse/modals/CreateCannedResponse/SharingOptions.tsx b/apps/meteor/ee/client/omnichannel/components/CannedResponse/modals/CreateCannedResponse/SharingOptions.tsx
index b78435d4718..6e7bc5ab0c4 100644
--- a/apps/meteor/ee/client/omnichannel/components/CannedResponse/modals/CreateCannedResponse/SharingOptions.tsx
+++ b/apps/meteor/ee/client/omnichannel/components/CannedResponse/modals/CreateCannedResponse/SharingOptions.tsx
@@ -1,6 +1,7 @@
 import { Box, RadioButton } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, memo } from 'react';
+import type { FC } from 'react';
+import React, { memo } from 'react';
 
 const SharingOptions: FC<{
 	isMonitor: boolean;
diff --git a/apps/meteor/ee/client/omnichannel/components/CannedResponse/modals/CreateCannedResponse/index.tsx b/apps/meteor/ee/client/omnichannel/components/CannedResponse/modals/CreateCannedResponse/index.tsx
index ed946cfebf7..69209dabd5a 100644
--- a/apps/meteor/ee/client/omnichannel/components/CannedResponse/modals/CreateCannedResponse/index.tsx
+++ b/apps/meteor/ee/client/omnichannel/components/CannedResponse/modals/CreateCannedResponse/index.tsx
@@ -1,5 +1,6 @@
 import { useSetModal, useToastMessageDispatch, usePermission, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, memo, useCallback, useEffect, useMemo, useState } from 'react';
+import type { FC } from 'react';
+import React, { memo, useCallback, useEffect, useMemo, useState } from 'react';
 
 import { useForm } from '../../../../../../../client/hooks/useForm';
 import CreateCannedResponseModal from './CreateCannedResponseModal';
diff --git a/apps/meteor/ee/client/omnichannel/components/contextualBar/CannedResponse/CannedResponse.stories.tsx b/apps/meteor/ee/client/omnichannel/components/contextualBar/CannedResponse/CannedResponse.stories.tsx
index d3f29fbda6b..1f5bd2e7c53 100644
--- a/apps/meteor/ee/client/omnichannel/components/contextualBar/CannedResponse/CannedResponse.stories.tsx
+++ b/apps/meteor/ee/client/omnichannel/components/contextualBar/CannedResponse/CannedResponse.stories.tsx
@@ -1,5 +1,5 @@
 import { Box } from '@rocket.chat/fuselage';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import CannedResponse from './CannedResponse';
diff --git a/apps/meteor/ee/client/omnichannel/components/contextualBar/CannedResponse/CannedResponse.tsx b/apps/meteor/ee/client/omnichannel/components/contextualBar/CannedResponse/CannedResponse.tsx
index 18b87e7df41..3c51bee8e75 100644
--- a/apps/meteor/ee/client/omnichannel/components/contextualBar/CannedResponse/CannedResponse.tsx
+++ b/apps/meteor/ee/client/omnichannel/components/contextualBar/CannedResponse/CannedResponse.tsx
@@ -1,7 +1,8 @@
 import type { ILivechatDepartment, IOmnichannelCannedResponse } from '@rocket.chat/core-typings';
 import { Box, Button, ButtonGroup, Tag } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, memo, MouseEventHandler } from 'react';
+import type { FC, MouseEventHandler } from 'react';
+import React, { memo } from 'react';
 
 import VerticalBar from '../../../../../../client/components/VerticalBar';
 import { useScopeDict } from '../../../hooks/useScopeDict';
diff --git a/apps/meteor/ee/client/omnichannel/components/contextualBar/CannedResponse/CannedResponseList.stories.tsx b/apps/meteor/ee/client/omnichannel/components/contextualBar/CannedResponse/CannedResponseList.stories.tsx
index 22d8bcba78c..f69deac5bb3 100644
--- a/apps/meteor/ee/client/omnichannel/components/contextualBar/CannedResponse/CannedResponseList.stories.tsx
+++ b/apps/meteor/ee/client/omnichannel/components/contextualBar/CannedResponse/CannedResponseList.stories.tsx
@@ -1,6 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
 import { action } from '@storybook/addon-actions';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import VerticalBar from '../../../../../../client/components/VerticalBar';
diff --git a/apps/meteor/ee/client/omnichannel/components/contextualBar/CannedResponse/CannedResponseList.tsx b/apps/meteor/ee/client/omnichannel/components/contextualBar/CannedResponse/CannedResponseList.tsx
index 2edaef29d87..084c77f8717 100644
--- a/apps/meteor/ee/client/omnichannel/components/contextualBar/CannedResponse/CannedResponseList.tsx
+++ b/apps/meteor/ee/client/omnichannel/components/contextualBar/CannedResponse/CannedResponseList.tsx
@@ -2,7 +2,8 @@ import type { ILivechatDepartment, IOmnichannelCannedResponse } from '@rocket.ch
 import { Box, Button, ButtonGroup, Icon, Margins, Select, TextInput } from '@rocket.chat/fuselage';
 import { useAutoFocus, useResizeObserver } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { Dispatch, FC, FormEventHandler, memo, MouseEvent, ReactElement, SetStateAction } from 'react';
+import type { Dispatch, FC, FormEventHandler, MouseEvent, ReactElement, SetStateAction } from 'react';
+import React, { memo } from 'react';
 import { Virtuoso } from 'react-virtuoso';
 
 import ScrollableContentWrapper from '../../../../../../client/components/ScrollableContentWrapper';
diff --git a/apps/meteor/ee/client/omnichannel/components/contextualBar/CannedResponse/Item.stories.tsx b/apps/meteor/ee/client/omnichannel/components/contextualBar/CannedResponse/Item.stories.tsx
index 467cbba76fb..b18745d5af5 100644
--- a/apps/meteor/ee/client/omnichannel/components/contextualBar/CannedResponse/Item.stories.tsx
+++ b/apps/meteor/ee/client/omnichannel/components/contextualBar/CannedResponse/Item.stories.tsx
@@ -1,5 +1,5 @@
 import { Box } from '@rocket.chat/fuselage';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import Item from './Item';
diff --git a/apps/meteor/ee/client/omnichannel/components/contextualBar/CannedResponse/Item.tsx b/apps/meteor/ee/client/omnichannel/components/contextualBar/CannedResponse/Item.tsx
index 817b89bd10f..969bba748af 100644
--- a/apps/meteor/ee/client/omnichannel/components/contextualBar/CannedResponse/Item.tsx
+++ b/apps/meteor/ee/client/omnichannel/components/contextualBar/CannedResponse/Item.tsx
@@ -2,7 +2,8 @@ import type { ILivechatDepartment, IOmnichannelCannedResponse } from '@rocket.ch
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Button, Icon, Tag } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC, memo, MouseEvent, useState } from 'react';
+import type { FC, MouseEvent } from 'react';
+import React, { memo, useState } from 'react';
 
 import { useScopeDict } from '../../../hooks/useScopeDict';
 
diff --git a/apps/meteor/ee/client/omnichannel/components/contextualBar/CannedResponse/WrapCannedResponse.tsx b/apps/meteor/ee/client/omnichannel/components/contextualBar/CannedResponse/WrapCannedResponse.tsx
index 9de83c06d10..3513de70524 100644
--- a/apps/meteor/ee/client/omnichannel/components/contextualBar/CannedResponse/WrapCannedResponse.tsx
+++ b/apps/meteor/ee/client/omnichannel/components/contextualBar/CannedResponse/WrapCannedResponse.tsx
@@ -1,5 +1,6 @@
 import { useSetModal, usePermission } from '@rocket.chat/ui-contexts';
-import React, { FC, memo, MouseEvent, MouseEventHandler } from 'react';
+import type { FC, MouseEvent, MouseEventHandler } from 'react';
+import React, { memo } from 'react';
 
 import CreateCannedResponse from '../../CannedResponse/modals';
 import CannedResponse from './CannedResponse';
diff --git a/apps/meteor/ee/client/omnichannel/components/contextualBar/CannedResponse/index.tsx b/apps/meteor/ee/client/omnichannel/components/contextualBar/CannedResponse/index.tsx
index 12351e2a10c..5d6eed0e885 100644
--- a/apps/meteor/ee/client/omnichannel/components/contextualBar/CannedResponse/index.tsx
+++ b/apps/meteor/ee/client/omnichannel/components/contextualBar/CannedResponse/index.tsx
@@ -1,6 +1,7 @@
 import { useDebouncedValue, useLocalStorage, useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useSetModal, useCurrentRoute, useRoute } from '@rocket.chat/ui-contexts';
-import React, { FC, memo, MouseEvent, useCallback, useMemo, useState } from 'react';
+import type { FC, MouseEvent } from 'react';
+import React, { memo, useCallback, useMemo, useState } from 'react';
 
 import { useRecordList } from '../../../../../../client/hooks/lists/useRecordList';
 import { AsyncStatePhase } from '../../../../../../client/lib/asyncState';
diff --git a/apps/meteor/ee/client/omnichannel/tags/CurrentChatTags.tsx b/apps/meteor/ee/client/omnichannel/tags/CurrentChatTags.tsx
index 7a19e6ca999..30bae332323 100644
--- a/apps/meteor/ee/client/omnichannel/tags/CurrentChatTags.tsx
+++ b/apps/meteor/ee/client/omnichannel/tags/CurrentChatTags.tsx
@@ -1,4 +1,5 @@
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import AutoCompleteTagsMultiple from './AutoCompleteTagsMultiple';
 
diff --git a/apps/meteor/ee/client/omnichannel/tags/TagEditWithDepartmentData.tsx b/apps/meteor/ee/client/omnichannel/tags/TagEditWithDepartmentData.tsx
index 526c64cf0ce..037ba7fe61c 100644
--- a/apps/meteor/ee/client/omnichannel/tags/TagEditWithDepartmentData.tsx
+++ b/apps/meteor/ee/client/omnichannel/tags/TagEditWithDepartmentData.tsx
@@ -1,7 +1,8 @@
 import type { ILivechatTag } from '@rocket.chat/core-typings';
 import { Callout } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useMemo, ReactNode } from 'react';
+import type { ReactElement, ReactNode } from 'react';
+import React, { useMemo } from 'react';
 
 import { FormSkeleton } from '../../../../client/components/Skeleton';
 import { AsyncStatePhase } from '../../../../client/hooks/useAsyncState';
diff --git a/apps/meteor/ee/client/omnichannel/units/UnitEditWithData.tsx b/apps/meteor/ee/client/omnichannel/units/UnitEditWithData.tsx
index c1e9b58ec8c..ff2ed2cffa9 100644
--- a/apps/meteor/ee/client/omnichannel/units/UnitEditWithData.tsx
+++ b/apps/meteor/ee/client/omnichannel/units/UnitEditWithData.tsx
@@ -1,6 +1,7 @@
 import { Callout } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { FC } from 'react';
+import type { FC } from 'react';
+import React from 'react';
 
 import { FormSkeleton } from '../../../../client/components/Skeleton';
 import { AsyncStatePhase } from '../../../../client/hooks/useAsyncState';
diff --git a/apps/meteor/ee/client/sidebar/footer/SidebarFooterWatermark.tsx b/apps/meteor/ee/client/sidebar/footer/SidebarFooterWatermark.tsx
index 418dbcd6a59..2ed58d67804 100644
--- a/apps/meteor/ee/client/sidebar/footer/SidebarFooterWatermark.tsx
+++ b/apps/meteor/ee/client/sidebar/footer/SidebarFooterWatermark.tsx
@@ -1,6 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { useIsEnterprise } from '../../../../client/hooks/useIsEnterprise';
 
diff --git a/apps/meteor/ee/client/views/account/deviceManagement/DeviceManagementAccountPage.tsx b/apps/meteor/ee/client/views/account/deviceManagement/DeviceManagementAccountPage.tsx
index cb289b33989..21628845c18 100644
--- a/apps/meteor/ee/client/views/account/deviceManagement/DeviceManagementAccountPage.tsx
+++ b/apps/meteor/ee/client/views/account/deviceManagement/DeviceManagementAccountPage.tsx
@@ -1,5 +1,6 @@
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import Page from '../../../../../client/components/Page';
 import DeviceManagementAccountTable from './DeviceManagementAccountTable';
diff --git a/apps/meteor/ee/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountRow.tsx b/apps/meteor/ee/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountRow.tsx
index 98ef911c9f2..f0246e7bd98 100644
--- a/apps/meteor/ee/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountRow.tsx
+++ b/apps/meteor/ee/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountRow.tsx
@@ -1,7 +1,8 @@
 import { Box, Button, TableRow, TableCell } from '@rocket.chat/fuselage';
 import { useMediaQuery } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { useFormatDateAndTime } from '../../../../../../client/hooks/useFormatDateAndTime';
 import DeviceIcon from '../../../../deviceManagement/components/DeviceIcon';
diff --git a/apps/meteor/ee/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountTable.tsx b/apps/meteor/ee/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountTable.tsx
index ed74d448f56..dc82b059456 100644
--- a/apps/meteor/ee/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountTable.tsx
+++ b/apps/meteor/ee/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountTable.tsx
@@ -1,6 +1,7 @@
 import { useMediaQuery } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useMemo } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo } from 'react';
 
 import { GenericTableHeaderCell } from '../../../../../../client/components/GenericTable';
 import { usePagination } from '../../../../../../client/components/GenericTable/hooks/usePagination';
diff --git a/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminPage.tsx b/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminPage.tsx
index effa1266249..fc6b7059dd5 100644
--- a/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminPage.tsx
+++ b/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminPage.tsx
@@ -1,5 +1,6 @@
 import { useRouteParameter, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useRef } from 'react';
+import type { ReactElement } from 'react';
+import React, { useRef } from 'react';
 
 import Page from '../../../../../client/components/Page';
 import DeviceManagementAdminTable from './DeviceManagementAdminTable';
diff --git a/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminRoute.tsx b/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminRoute.tsx
index 5b15b7e093f..eb743fcad70 100644
--- a/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminRoute.tsx
+++ b/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminRoute.tsx
@@ -1,5 +1,6 @@
 import { usePermission } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import NotAuthorizedPage from '../../../../../client/views/notAuthorized/NotAuthorizedPage';
 import DeviceManagementAdminPage from './DeviceManagementAdminPage';
diff --git a/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminRow.tsx b/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminRow.tsx
index 503585a7e9b..4a600283f1b 100644
--- a/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminRow.tsx
+++ b/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminRow.tsx
@@ -1,7 +1,8 @@
 import { Box, TableRow, TableCell, Menu, Option } from '@rocket.chat/fuselage';
 import { useMediaQuery, useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useRoute, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { KeyboardEvent, ReactElement, useCallback } from 'react';
+import type { KeyboardEvent, ReactElement } from 'react';
+import React, { useCallback } from 'react';
 
 import { useFormatDateAndTime } from '../../../../../../client/hooks/useFormatDateAndTime';
 import DeviceIcon from '../../../../deviceManagement/components/DeviceIcon';
diff --git a/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminTable.tsx b/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminTable.tsx
index b32bf605381..aed94ad8732 100644
--- a/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminTable.tsx
+++ b/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminTable.tsx
@@ -1,7 +1,8 @@
-import { DeviceManagementPopulatedSession, DeviceManagementSession, Serialized } from '@rocket.chat/core-typings';
+import type { DeviceManagementPopulatedSession, DeviceManagementSession, Serialized } from '@rocket.chat/core-typings';
 import { useDebouncedValue, useMediaQuery } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useState, useMemo, useEffect, MutableRefObject } from 'react';
+import type { ReactElement, MutableRefObject } from 'react';
+import React, { useState, useMemo, useEffect } from 'react';
 
 import FilterByText from '../../../../../../client/components/FilterByText';
 import { GenericTableHeaderCell } from '../../../../../../client/components/GenericTable';
diff --git a/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfo.tsx b/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfo.tsx
index 6245308bcb0..d22c3af77e6 100644
--- a/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfo.tsx
+++ b/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfo.tsx
@@ -1,7 +1,8 @@
-import { DeviceManagementPopulatedSession } from '@rocket.chat/core-typings';
+import type { DeviceManagementPopulatedSession } from '@rocket.chat/core-typings';
 import { Box, Button, ButtonGroup, StatusBullet } from '@rocket.chat/fuselage';
 import { useRoute, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useCallback } from 'react';
+import type { ReactElement } from 'react';
+import React, { useCallback } from 'react';
 
 import InfoPanel from '../../../../../../client/components/InfoPanel';
 import VerticalBar from '../../../../../../client/components/VerticalBar';
diff --git a/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfoWithData.tsx b/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfoWithData.tsx
index 3c1a7036a5b..14052bc71e2 100644
--- a/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfoWithData.tsx
+++ b/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfoWithData.tsx
@@ -1,7 +1,8 @@
-import { Serialized, DeviceManagementPopulatedSession } from '@rocket.chat/core-typings';
+import type { Serialized, DeviceManagementPopulatedSession } from '@rocket.chat/core-typings';
 import { Box, States, StatesIcon, StatesTitle, StatesSubtitle } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useMemo } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo } from 'react';
 
 import VerticalBar from '../../../../../../client/components/VerticalBar';
 import { useEndpointData } from '../../../../../../client/hooks/useEndpointData';
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardCard.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardCard.tsx
index 54b0078d5f1..06982a057f3 100644
--- a/apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardCard.tsx
+++ b/apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardCard.tsx
@@ -1,6 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
 import { Card } from '@rocket.chat/ui-client';
-import React, { ReactElement, ReactNode } from 'react';
+import type { ReactElement, ReactNode } from 'react';
+import React from 'react';
 
 import EngagementDashboardCardErrorBoundary from './EngagementDashboardCardErrorBoundary';
 
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardCardErrorBoundary.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardCardErrorBoundary.tsx
index 2d51ed66af5..6e2b2d814b0 100644
--- a/apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardCardErrorBoundary.tsx
+++ b/apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardCardErrorBoundary.tsx
@@ -1,7 +1,8 @@
 import { States, StatesAction, StatesActions, StatesIcon, StatesSubtitle, StatesTitle } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import { QueryErrorResetBoundary } from '@tanstack/react-query';
-import React, { ReactElement, ReactNode, useState } from 'react';
+import type { ReactElement, ReactNode } from 'react';
+import React, { useState } from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
 
 export type EngagementDashboardCardErrorBoundaryProps = {
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardCardFilter.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardCardFilter.tsx
index 55a702b6671..77311af255d 100644
--- a/apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardCardFilter.tsx
+++ b/apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardCardFilter.tsx
@@ -1,5 +1,6 @@
 import { Box, Flex, InputBox } from '@rocket.chat/fuselage';
-import React, { ReactElement, ReactNode } from 'react';
+import type { ReactElement, ReactNode } from 'react';
+import React from 'react';
 
 type EngagementDashboardCardFilterProps = {
 	children?: ReactNode;
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardPage.stories.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardPage.stories.tsx
index e8973f2bc48..045b6c3d4d9 100644
--- a/apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardPage.stories.tsx
+++ b/apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardPage.stories.tsx
@@ -1,5 +1,6 @@
-import { Meta, Story } from '@storybook/react';
-import React, { ReactElement } from 'react';
+import type { Meta, Story } from '@storybook/react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import EngagementDashboardPage from './EngagementDashboardPage';
 
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardPage.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardPage.tsx
index 790a4d2bf24..d5d79388e62 100644
--- a/apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardPage.tsx
+++ b/apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardPage.tsx
@@ -1,6 +1,7 @@
 import { Box, Select, Tabs } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useCallback, useMemo, useState } from 'react';
+import type { ReactElement } from 'react';
+import React, { useCallback, useMemo, useState } from 'react';
 
 import Page from '../../../../../client/components/Page';
 import ChannelsTab from './channels/ChannelsTab';
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardRoute.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardRoute.tsx
index ee53c8c364d..f3992a2b0c7 100644
--- a/apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardRoute.tsx
+++ b/apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardRoute.tsx
@@ -1,5 +1,6 @@
 import { useCurrentRoute, useRoute, usePermission } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useEffect } from 'react';
+import type { ReactElement } from 'react';
+import React, { useEffect } from 'react';
 
 import { useEndpointAction } from '../../../../../client/hooks/useEndpointAction';
 import NotAuthorizedPage from '../../../../../client/views/notAuthorized/NotAuthorizedPage';
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/channels/ChannelsOverview.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/channels/ChannelsOverview.tsx
index c7b9b055538..d61604af1b7 100644
--- a/apps/meteor/ee/client/views/admin/engagementDashboard/channels/ChannelsOverview.tsx
+++ b/apps/meteor/ee/client/views/admin/engagementDashboard/channels/ChannelsOverview.tsx
@@ -1,7 +1,8 @@
 import { Box, Icon, Margins, Pagination, Skeleton, Table, Tile } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
-import React, { ReactElement, useMemo, useState } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo, useState } from 'react';
 
 import Growth from '../../../../../../client/components/dataView/Growth';
 import EngagementDashboardCardFilter from '../EngagementDashboardCardFilter';
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/channels/ChannelsTab.stories.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/channels/ChannelsTab.stories.tsx
index e6343059a30..1f8e7e461ea 100644
--- a/apps/meteor/ee/client/views/admin/engagementDashboard/channels/ChannelsTab.stories.tsx
+++ b/apps/meteor/ee/client/views/admin/engagementDashboard/channels/ChannelsTab.stories.tsx
@@ -1,5 +1,5 @@
 import { Margins } from '@rocket.chat/fuselage';
-import { Meta, Story } from '@storybook/react';
+import type { Meta, Story } from '@storybook/react';
 import React from 'react';
 
 import ChannelsTab from './ChannelsOverview';
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/channels/ChannelsTab.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/channels/ChannelsTab.tsx
index 986c76bf52e..f0a732c2501 100644
--- a/apps/meteor/ee/client/views/admin/engagementDashboard/channels/ChannelsTab.tsx
+++ b/apps/meteor/ee/client/views/admin/engagementDashboard/channels/ChannelsTab.tsx
@@ -1,4 +1,5 @@
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import EngagementDashboardCard from '../EngagementDashboardCard';
 import ChannelsOverview from './ChannelsOverview';
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/channels/useChannelsList.ts b/apps/meteor/ee/client/views/admin/engagementDashboard/channels/useChannelsList.ts
index 584a42425c2..4e171732d55 100644
--- a/apps/meteor/ee/client/views/admin/engagementDashboard/channels/useChannelsList.ts
+++ b/apps/meteor/ee/client/views/admin/engagementDashboard/channels/useChannelsList.ts
@@ -1,7 +1,8 @@
 import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 
-import { getPeriodRange, Period } from '../dataView/periods';
+import type { Period } from '../dataView/periods';
+import { getPeriodRange } from '../dataView/periods';
 
 type UseChannelsListOptions = {
 	period: Period['key'];
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/DownloadDataButton.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/DownloadDataButton.tsx
index 97ff0012846..e7b5b9bcba3 100644
--- a/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/DownloadDataButton.tsx
+++ b/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/DownloadDataButton.tsx
@@ -1,6 +1,8 @@
-import { Box, IconButton } from '@rocket.chat/fuselage';
+import type { Box } from '@rocket.chat/fuselage';
+import { IconButton } from '@rocket.chat/fuselage';
 import { useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ComponentProps, ReactElement } from 'react';
+import type { ComponentProps, ReactElement } from 'react';
+import React from 'react';
 
 import { downloadCsvAs } from '../../../../../../client/lib/download';
 
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/LegendSymbol.stories.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/LegendSymbol.stories.tsx
index b69fb2febcd..57a27a2cd83 100644
--- a/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/LegendSymbol.stories.tsx
+++ b/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/LegendSymbol.stories.tsx
@@ -1,6 +1,7 @@
 import { Box, Margins } from '@rocket.chat/fuselage';
-import { Meta, Story } from '@storybook/react';
-import React, { ReactElement } from 'react';
+import type { Meta, Story } from '@storybook/react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import LegendSymbol from './LegendSymbol';
 import { monochromaticColors, polychromaticColors } from './colors';
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/LegendSymbol.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/LegendSymbol.tsx
index 8a688eb26d3..bf4eec2881d 100644
--- a/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/LegendSymbol.tsx
+++ b/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/LegendSymbol.tsx
@@ -1,5 +1,6 @@
 import { Box, Margins } from '@rocket.chat/fuselage';
-import React, { CSSProperties, ReactElement } from 'react';
+import type { CSSProperties, ReactElement } from 'react';
+import React from 'react';
 
 type LegendSymbolProps = {
 	color?: CSSProperties['backgroundColor'];
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/PeriodSelector.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/PeriodSelector.tsx
index 80447ad4ec3..eaadcd27d41 100644
--- a/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/PeriodSelector.tsx
+++ b/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/PeriodSelector.tsx
@@ -1,8 +1,10 @@
 import { Select } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useMemo } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo } from 'react';
 
-import { getPeriod, Period } from './periods';
+import type { Period } from './periods';
+import { getPeriod } from './periods';
 
 type PeriodSelectorProps<TPeriod extends Period['key']> = {
 	periods: TPeriod[];
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/periods.ts b/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/periods.ts
index f84856e7586..e01efcd1e7b 100644
--- a/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/periods.ts
+++ b/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/periods.ts
@@ -1,4 +1,4 @@
-import { TranslationKey } from '@rocket.chat/ui-contexts';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
 
 const label = (
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/usePeriodLabel.ts b/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/usePeriodLabel.ts
index 837864479ac..8a8845703a4 100644
--- a/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/usePeriodLabel.ts
+++ b/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/usePeriodLabel.ts
@@ -1,7 +1,8 @@
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import { useMemo } from 'react';
 
-import { getPeriod, Period } from './periods';
+import type { Period } from './periods';
+import { getPeriod } from './periods';
 
 export const usePeriodLabel = (period: Period['key']): string => {
 	const t = useTranslation();
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/usePeriodSelectorState.ts b/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/usePeriodSelectorState.ts
index 35ce960e583..b034f6935e8 100644
--- a/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/usePeriodSelectorState.ts
+++ b/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/usePeriodSelectorState.ts
@@ -1,6 +1,6 @@
 import { useState } from 'react';
 
-import { Period } from './periods';
+import type { Period } from './periods';
 
 export const usePeriodSelectorState = <TPeriod extends Period['key']>(
 	...periods: TPeriod[]
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesPerChannelSection.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesPerChannelSection.tsx
index a0f3cd45073..4a37ce17d6b 100644
--- a/apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesPerChannelSection.tsx
+++ b/apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesPerChannelSection.tsx
@@ -2,7 +2,8 @@ import { ResponsivePie } from '@nivo/pie';
 import { Box, Flex, Icon, Margins, Skeleton, Table, Tile } from '@rocket.chat/fuselage';
 import colors from '@rocket.chat/fuselage-tokens/colors';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useMemo } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo } from 'react';
 
 import EngagementDashboardCardFilter from '../EngagementDashboardCardFilter';
 import DownloadDataButton from '../dataView/DownloadDataButton';
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesSentSection.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesSentSection.tsx
index ee980db70d1..abe6d64fabc 100644
--- a/apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesSentSection.tsx
+++ b/apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesSentSection.tsx
@@ -3,7 +3,8 @@ import { Box, Flex, Skeleton } from '@rocket.chat/fuselage';
 import colors from '@rocket.chat/fuselage-tokens/colors.json';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
-import React, { ReactElement, useMemo } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo } from 'react';
 
 import CounterSet from '../../../../../../client/components/dataView/CounterSet';
 import EngagementDashboardCardFilter from '../EngagementDashboardCardFilter';
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesTab.stories.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesTab.stories.tsx
index 4b75f65b11c..8fe3774de02 100644
--- a/apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesTab.stories.tsx
+++ b/apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesTab.stories.tsx
@@ -1,5 +1,5 @@
 import { Margins } from '@rocket.chat/fuselage';
-import { Meta, Story } from '@storybook/react';
+import type { Meta, Story } from '@storybook/react';
 import React from 'react';
 
 import MessagesTab from './MessagesTab';
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesTab.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesTab.tsx
index a0dc1227dd3..1e12d982d8b 100644
--- a/apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesTab.tsx
+++ b/apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesTab.tsx
@@ -1,5 +1,6 @@
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import EngagementDashboardCard from '../EngagementDashboardCard';
 import MessagesPerChannelSection from './MessagesPerChannelSection';
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/messages/useMessageOrigins.ts b/apps/meteor/ee/client/views/admin/engagementDashboard/messages/useMessageOrigins.ts
index 6fbd61ca33c..a3d64bceaae 100644
--- a/apps/meteor/ee/client/views/admin/engagementDashboard/messages/useMessageOrigins.ts
+++ b/apps/meteor/ee/client/views/admin/engagementDashboard/messages/useMessageOrigins.ts
@@ -1,7 +1,8 @@
 import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 
-import { getPeriodRange, Period } from '../dataView/periods';
+import type { Period } from '../dataView/periods';
+import { getPeriodRange } from '../dataView/periods';
 
 type UseMessageOriginsOptions = { period: Period['key'] };
 
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/messages/useMessagesSent.ts b/apps/meteor/ee/client/views/admin/engagementDashboard/messages/useMessagesSent.ts
index 1503b48027d..a12d22b4571 100644
--- a/apps/meteor/ee/client/views/admin/engagementDashboard/messages/useMessagesSent.ts
+++ b/apps/meteor/ee/client/views/admin/engagementDashboard/messages/useMessagesSent.ts
@@ -1,7 +1,8 @@
 import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 
-import { getPeriodRange, Period } from '../dataView/periods';
+import type { Period } from '../dataView/periods';
+import { getPeriodRange } from '../dataView/periods';
 
 type UseMessagesSentOptions = { period: Period['key'] };
 
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/messages/useTopFivePopularChannels.ts b/apps/meteor/ee/client/views/admin/engagementDashboard/messages/useTopFivePopularChannels.ts
index 5d8b3d88a1b..87295337a1b 100644
--- a/apps/meteor/ee/client/views/admin/engagementDashboard/messages/useTopFivePopularChannels.ts
+++ b/apps/meteor/ee/client/views/admin/engagementDashboard/messages/useTopFivePopularChannels.ts
@@ -1,7 +1,8 @@
 import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 
-import { getPeriodRange, Period } from '../dataView/periods';
+import type { Period } from '../dataView/periods';
+import { getPeriodRange } from '../dataView/periods';
 
 type UseTopFivePopularChannelsOptions = { period: Period['key'] };
 
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx
index 0b9566a5fba..cfbf513f6ee 100644
--- a/apps/meteor/ee/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx
+++ b/apps/meteor/ee/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx
@@ -3,7 +3,8 @@ import { Box, Flex, Skeleton, Tile } from '@rocket.chat/fuselage';
 import colors from '@rocket.chat/fuselage-tokens/colors.json';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
-import React, { ReactElement, useMemo } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo } from 'react';
 
 import CounterSet from '../../../../../../client/components/dataView/CounterSet';
 import { useFormatDate } from '../../../../../../client/hooks/useFormatDate';
@@ -65,11 +66,11 @@ const ActiveUsersSection = ({ timezone }: ActiveUsersSectionProps): ReactElement
 		const distributeValueOverPoints = (
 			usersListsMap: { [x: number]: string[] },
 			dateOffset: number,
-			T: number,
+			count: number,
 			array: { x: Date; y: number }[],
 		): void => {
 			const usersSet = new Set();
-			for (let k = dateOffset; T > 0; k--, T--) {
+			for (let k = dateOffset; count > 0; k--, count--) {
 				if (usersListsMap[k]) {
 					usersListsMap[k].forEach((userId) => usersSet.add(userId));
 				}
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/users/BusiestChatTimesSection.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/users/BusiestChatTimesSection.tsx
index 232ae03bb79..0bed6d7ffe6 100644
--- a/apps/meteor/ee/client/views/admin/engagementDashboard/users/BusiestChatTimesSection.tsx
+++ b/apps/meteor/ee/client/views/admin/engagementDashboard/users/BusiestChatTimesSection.tsx
@@ -1,6 +1,7 @@
 import { Select } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useMemo, useState } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo, useState } from 'react';
 
 import EngagementDashboardCardFilter from '../EngagementDashboardCardFilter';
 import ContentForDays from './ContentForDays';
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 d843b56aa5b..b2bff295e9f 100644
--- a/apps/meteor/ee/client/views/admin/engagementDashboard/users/ContentForDays.tsx
+++ b/apps/meteor/ee/client/views/admin/engagementDashboard/users/ContentForDays.tsx
@@ -2,7 +2,8 @@ import { ResponsiveBar } from '@nivo/bar';
 import { Box, Flex, IconButton, Margins, Skeleton } from '@rocket.chat/fuselage';
 import colors from '@rocket.chat/fuselage-tokens/colors';
 import moment from 'moment';
-import React, { ReactElement, useMemo } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo } from 'react';
 
 import { useWeeklyChatActivity } from './useWeeklyChatActivity';
 
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/users/ContentForHours.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/users/ContentForHours.tsx
index 443b9dcb287..a034c850a03 100644
--- a/apps/meteor/ee/client/views/admin/engagementDashboard/users/ContentForHours.tsx
+++ b/apps/meteor/ee/client/views/admin/engagementDashboard/users/ContentForHours.tsx
@@ -4,7 +4,8 @@ import { useBreakpoints } from '@rocket.chat/fuselage-hooks';
 import colors from '@rocket.chat/fuselage-tokens/colors.json';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
-import React, { ReactElement, useMemo } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo } from 'react';
 
 import { useHourlyChatActivity } from './useHourlyChatActivity';
 
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/users/NewUsersSection.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/users/NewUsersSection.tsx
index e95bdd02bbb..c5c4163c22a 100644
--- a/apps/meteor/ee/client/views/admin/engagementDashboard/users/NewUsersSection.tsx
+++ b/apps/meteor/ee/client/views/admin/engagementDashboard/users/NewUsersSection.tsx
@@ -4,7 +4,8 @@ import { useResizeObserver } from '@rocket.chat/fuselage-hooks';
 import colors from '@rocket.chat/fuselage-tokens/colors.json';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
-import React, { ReactElement, useMemo } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo } from 'react';
 
 import CounterSet from '../../../../../../client/components/dataView/CounterSet';
 import { useFormatDate } from '../../../../../../client/hooks/useFormatDate';
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/users/UsersByTimeOfTheDaySection.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/users/UsersByTimeOfTheDaySection.tsx
index 112ddf09c47..96b88735367 100644
--- a/apps/meteor/ee/client/views/admin/engagementDashboard/users/UsersByTimeOfTheDaySection.tsx
+++ b/apps/meteor/ee/client/views/admin/engagementDashboard/users/UsersByTimeOfTheDaySection.tsx
@@ -3,7 +3,8 @@ import { Box, Flex, Skeleton, Tooltip } from '@rocket.chat/fuselage';
 import colors from '@rocket.chat/fuselage-tokens/colors.json';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
-import React, { ReactElement, useMemo } from 'react';
+import type { ReactElement } from 'react';
+import React, { useMemo } from 'react';
 
 import EngagementDashboardCardFilter from '../EngagementDashboardCardFilter';
 import DownloadDataButton from '../dataView/DownloadDataButton';
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/users/UsersTab.stories.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/users/UsersTab.stories.tsx
index 9446c3c56e5..61eead3cace 100644
--- a/apps/meteor/ee/client/views/admin/engagementDashboard/users/UsersTab.stories.tsx
+++ b/apps/meteor/ee/client/views/admin/engagementDashboard/users/UsersTab.stories.tsx
@@ -1,6 +1,7 @@
 import { Margins } from '@rocket.chat/fuselage';
-import { Meta, Story } from '@storybook/react';
-import React, { ReactElement } from 'react';
+import type { Meta, Story } from '@storybook/react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import UsersTab from './UsersTab';
 
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/users/UsersTab.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/users/UsersTab.tsx
index 831cec62bee..b79d0b9c9a6 100644
--- a/apps/meteor/ee/client/views/admin/engagementDashboard/users/UsersTab.tsx
+++ b/apps/meteor/ee/client/views/admin/engagementDashboard/users/UsersTab.tsx
@@ -1,7 +1,8 @@
 import { Box, Flex } from '@rocket.chat/fuselage';
 import { useBreakpoints } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import EngagementDashboardCard from '../EngagementDashboardCard';
 import ActiveUsersSection from './ActiveUsersSection';
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/users/useNewUsers.ts b/apps/meteor/ee/client/views/admin/engagementDashboard/users/useNewUsers.ts
index 2ce2c0938d2..9da01cff21e 100644
--- a/apps/meteor/ee/client/views/admin/engagementDashboard/users/useNewUsers.ts
+++ b/apps/meteor/ee/client/views/admin/engagementDashboard/users/useNewUsers.ts
@@ -1,7 +1,8 @@
 import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 
-import { getPeriodRange, Period } from '../dataView/periods';
+import type { Period } from '../dataView/periods';
+import { getPeriodRange } from '../dataView/periods';
 
 export type UseNewUsersOptions = { period: Period['key']; utc: boolean };
 
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/users/useUsersByTimeOfTheDay.ts b/apps/meteor/ee/client/views/admin/engagementDashboard/users/useUsersByTimeOfTheDay.ts
index 93762752825..561ec76c155 100644
--- a/apps/meteor/ee/client/views/admin/engagementDashboard/users/useUsersByTimeOfTheDay.ts
+++ b/apps/meteor/ee/client/views/admin/engagementDashboard/users/useUsersByTimeOfTheDay.ts
@@ -1,7 +1,8 @@
 import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 
-import { getPeriodRange, Period } from '../dataView/periods';
+import type { Period } from '../dataView/periods';
+import { getPeriodRange } from '../dataView/periods';
 
 type UseUsersByTimeOfTheDayOptions = { period: Period['key']; utc: boolean };
 
diff --git a/apps/meteor/ee/client/views/admin/info/SeatsCard.tsx b/apps/meteor/ee/client/views/admin/info/SeatsCard.tsx
index fcd98751a3b..832bbdb0436 100644
--- a/apps/meteor/ee/client/views/admin/info/SeatsCard.tsx
+++ b/apps/meteor/ee/client/views/admin/info/SeatsCard.tsx
@@ -2,7 +2,8 @@ import { Box, Button, ButtonGroup, Skeleton } from '@rocket.chat/fuselage';
 import colors from '@rocket.chat/fuselage-tokens/colors';
 import { ExternalLink, Card } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import UsagePieGraph from '../../../../../client/views/admin/info/UsagePieGraph';
 import { useRequestSeatsLink } from '../users/useRequestSeatsLink';
diff --git a/apps/meteor/ee/client/views/admin/users/CloseToSeatsCapModal.tsx b/apps/meteor/ee/client/views/admin/users/CloseToSeatsCapModal.tsx
index e85601ebde6..986abe4454c 100644
--- a/apps/meteor/ee/client/views/admin/users/CloseToSeatsCapModal.tsx
+++ b/apps/meteor/ee/client/views/admin/users/CloseToSeatsCapModal.tsx
@@ -1,7 +1,8 @@
 import { Modal, Button, Box } from '@rocket.chat/fuselage';
 import { ExternalLink } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import MemberCapUsage from './SeatsCapUsage';
 
diff --git a/apps/meteor/ee/client/views/admin/users/ReachedSeatsCapModal.tsx b/apps/meteor/ee/client/views/admin/users/ReachedSeatsCapModal.tsx
index a9bc44d596d..ba27595ed38 100644
--- a/apps/meteor/ee/client/views/admin/users/ReachedSeatsCapModal.tsx
+++ b/apps/meteor/ee/client/views/admin/users/ReachedSeatsCapModal.tsx
@@ -1,7 +1,8 @@
 import { Icon, Modal, Button, Box } from '@rocket.chat/fuselage';
 import { ExternalLink } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import SeatsCapUsage from './SeatsCapUsage';
 
diff --git a/apps/meteor/ee/client/views/admin/users/SeatsCapUsage/SeatsCapUsage.stories.tsx b/apps/meteor/ee/client/views/admin/users/SeatsCapUsage/SeatsCapUsage.stories.tsx
index 50782ae5b78..3752ace5935 100644
--- a/apps/meteor/ee/client/views/admin/users/SeatsCapUsage/SeatsCapUsage.stories.tsx
+++ b/apps/meteor/ee/client/views/admin/users/SeatsCapUsage/SeatsCapUsage.stories.tsx
@@ -1,4 +1,5 @@
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import SeatsCapUsage from './SeatsCapUsage';
 
diff --git a/apps/meteor/ee/client/views/admin/users/SeatsCapUsage/SeatsCapUsage.tsx b/apps/meteor/ee/client/views/admin/users/SeatsCapUsage/SeatsCapUsage.tsx
index ee64fbffbdd..7e4821fbd8e 100644
--- a/apps/meteor/ee/client/views/admin/users/SeatsCapUsage/SeatsCapUsage.tsx
+++ b/apps/meteor/ee/client/views/admin/users/SeatsCapUsage/SeatsCapUsage.tsx
@@ -1,6 +1,7 @@
 import { ProgressBar, Box } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 type SeatsCapUsageProps = {
 	limit: number;
diff --git a/apps/meteor/ee/client/views/admin/users/UserPageHeaderContentWithSeatsCap.tsx b/apps/meteor/ee/client/views/admin/users/UserPageHeaderContentWithSeatsCap.tsx
index f9f8145fd80..a900358fecd 100644
--- a/apps/meteor/ee/client/views/admin/users/UserPageHeaderContentWithSeatsCap.tsx
+++ b/apps/meteor/ee/client/views/admin/users/UserPageHeaderContentWithSeatsCap.tsx
@@ -1,7 +1,8 @@
 import { Button, ButtonGroup, Icon, Margins } from '@rocket.chat/fuselage';
 import { ExternalLink } from '@rocket.chat/ui-client';
 import { useSetModal, useRoute, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import CloseToSeatsCapModal from './CloseToSeatsCapModal';
 import ReachedSeatsCapModal from './ReachedSeatsCapModal';
diff --git a/apps/meteor/ee/client/voip/components/modals/WrapUpCallModal.tsx b/apps/meteor/ee/client/voip/components/modals/WrapUpCallModal.tsx
index af95ee74ad0..13b99007526 100644
--- a/apps/meteor/ee/client/voip/components/modals/WrapUpCallModal.tsx
+++ b/apps/meteor/ee/client/voip/components/modals/WrapUpCallModal.tsx
@@ -1,7 +1,9 @@
 import { Button, Field, Modal, TextAreaInput } from '@rocket.chat/fuselage';
 import { useSetModal, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useEffect } from 'react';
-import { useForm, SubmitHandler } from 'react-hook-form';
+import type { ReactElement } from 'react';
+import React, { useEffect } from 'react';
+import type { SubmitHandler } from 'react-hook-form';
+import { useForm } from 'react-hook-form';
 
 import Tags from '../../../../../client/components/Omnichannel/Tags';
 
diff --git a/apps/meteor/ee/client/voip/modal/DialPad/DialInput.tsx b/apps/meteor/ee/client/voip/modal/DialPad/DialInput.tsx
index 751f8816581..cf96f4e2650 100644
--- a/apps/meteor/ee/client/voip/modal/DialPad/DialInput.tsx
+++ b/apps/meteor/ee/client/voip/modal/DialPad/DialInput.tsx
@@ -1,6 +1,7 @@
 import { IconButton, TextInput } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React, { ChangeEvent, FocusEvent, forwardRef } from 'react';
+import type { ChangeEvent, FocusEvent } from 'react';
+import React, { forwardRef } from 'react';
 
 type DialInputProps = {
 	inputName: string;
diff --git a/apps/meteor/ee/client/voip/modal/DialPad/DialPadModal.stories.tsx b/apps/meteor/ee/client/voip/modal/DialPad/DialPadModal.stories.tsx
index 0ef3d7922b0..b0b13fd9d6b 100644
--- a/apps/meteor/ee/client/voip/modal/DialPad/DialPadModal.stories.tsx
+++ b/apps/meteor/ee/client/voip/modal/DialPad/DialPadModal.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import DialPadModal from './DialPadModal';
diff --git a/apps/meteor/ee/client/voip/modal/DialPad/DialPadModal.tsx b/apps/meteor/ee/client/voip/modal/DialPad/DialPadModal.tsx
index ae8227a4efd..de409bf13f0 100644
--- a/apps/meteor/ee/client/voip/modal/DialPad/DialPadModal.tsx
+++ b/apps/meteor/ee/client/voip/modal/DialPad/DialPadModal.tsx
@@ -1,6 +1,7 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Field, Modal, IconButton } from '@rocket.chat/fuselage';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import { DialInput } from './DialInput';
 import Pad from './Pad';
diff --git a/apps/meteor/ee/client/voip/modal/DialPad/Pad.tsx b/apps/meteor/ee/client/voip/modal/DialPad/Pad.tsx
index 1040d998aa0..3a39a8e5aa4 100644
--- a/apps/meteor/ee/client/voip/modal/DialPad/Pad.tsx
+++ b/apps/meteor/ee/client/voip/modal/DialPad/Pad.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import PadButton from './PadButton';
 
diff --git a/apps/meteor/ee/client/voip/modal/DialPad/PadButton.tsx b/apps/meteor/ee/client/voip/modal/DialPad/PadButton.tsx
index 6effb22c1ca..d41687f8876 100644
--- a/apps/meteor/ee/client/voip/modal/DialPad/PadButton.tsx
+++ b/apps/meteor/ee/client/voip/modal/DialPad/PadButton.tsx
@@ -1,7 +1,8 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Button } from '@rocket.chat/fuselage';
 import colors from '@rocket.chat/fuselage-tokens/colors';
-import React, { ReactElement } from 'react';
+import type { ReactElement } from 'react';
+import React from 'react';
 
 import type { PadDigit } from './Pad';
 import { useLongPress } from './hooks/useLongPress';
diff --git a/apps/meteor/ee/client/voip/modal/DialPad/hooks/useDialPad.tsx b/apps/meteor/ee/client/voip/modal/DialPad/hooks/useDialPad.tsx
index 79206003a93..7f10e1d08ee 100644
--- a/apps/meteor/ee/client/voip/modal/DialPad/hooks/useDialPad.tsx
+++ b/apps/meteor/ee/client/voip/modal/DialPad/hooks/useDialPad.tsx
@@ -1,10 +1,11 @@
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import { ChangeEvent, RefCallback, useCallback, useEffect, useState } from 'react';
+import type { ChangeEvent, RefCallback } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 import { useForm } from 'react-hook-form';
 
 import { useDialModal } from '../../../../../../client/hooks/useDialModal';
 import { useOutboundDialer } from '../../../../hooks/useOutboundDialer';
-import { PadDigit } from '../Pad';
+import type { PadDigit } from '../Pad';
 
 type DialPadStateHandlers = {
 	inputName: string;
diff --git a/apps/meteor/ee/client/voip/modal/DialPad/hooks/useLongPress.tsx b/apps/meteor/ee/client/voip/modal/DialPad/hooks/useLongPress.tsx
index 2f2457a7b54..e0f0e6e76f9 100644
--- a/apps/meteor/ee/client/voip/modal/DialPad/hooks/useLongPress.tsx
+++ b/apps/meteor/ee/client/voip/modal/DialPad/hooks/useLongPress.tsx
@@ -1,5 +1,6 @@
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { MouseEvent, MouseEventHandler, TouchEvent, TouchEventHandler, useRef } from 'react';
+import type { MouseEvent, MouseEventHandler, TouchEvent, TouchEventHandler } from 'react';
+import { useRef } from 'react';
 
 type UseLongPressResult = {
 	onClick: MouseEventHandler<HTMLButtonElement>;
diff --git a/apps/meteor/ee/client/voip/modals/DeviceSettingsModal.tsx b/apps/meteor/ee/client/voip/modals/DeviceSettingsModal.tsx
index c2eba940d10..a75cf037240 100644
--- a/apps/meteor/ee/client/voip/modals/DeviceSettingsModal.tsx
+++ b/apps/meteor/ee/client/voip/modals/DeviceSettingsModal.tsx
@@ -1,4 +1,5 @@
-import { Modal, Field, Select, Button, SelectOption, Box } from '@rocket.chat/fuselage';
+import type { SelectOption } from '@rocket.chat/fuselage';
+import { Modal, Field, Select, Button, Box } from '@rocket.chat/fuselage';
 import {
 	useTranslation,
 	useAvailableDevices,
@@ -7,8 +8,10 @@ import {
 	useSelectedDevices,
 	useIsDeviceManagementEnabled,
 } from '@rocket.chat/ui-contexts';
-import React, { ReactElement, useState } from 'react';
-import { useForm, Controller, SubmitHandler } from 'react-hook-form';
+import type { ReactElement } from 'react';
+import React, { useState } from 'react';
+import type { SubmitHandler } from 'react-hook-form';
+import { useForm, Controller } from 'react-hook-form';
 
 import { useChangeAudioInputDevice, useChangeAudioOutputDevice } from '../../../../client/contexts/CallContext';
 import { isSetSinkIdAvailable } from '../../../../client/providers/DeviceProvider/lib/isSetSinkIdAvailable';
diff --git a/apps/meteor/ee/definition/methods.ts b/apps/meteor/ee/definition/methods.ts
index 956bf3c18a6..0db72320f8c 100644
--- a/apps/meteor/ee/definition/methods.ts
+++ b/apps/meteor/ee/definition/methods.ts
@@ -1,7 +1,8 @@
 import '@rocket.chat/ui-contexts';
-import { ILicenseTag } from '../app/license/definitions/ILicenseTag';
+import type { ILicenseTag } from '../app/license/definitions/ILicenseTag';
 
 declare module '@rocket.chat/ui-contexts' {
+	// eslint-disable-next-line @typescript-eslint/naming-convention
 	export interface ServerMethods {
 		'license:getModules': () => string[];
 		'license:getTags': () => ILicenseTag[];
diff --git a/apps/meteor/ee/definition/rest/v1/engagementDashboard.ts b/apps/meteor/ee/definition/rest/v1/engagementDashboard.ts
index a9c1b6be5af..14830771678 100644
--- a/apps/meteor/ee/definition/rest/v1/engagementDashboard.ts
+++ b/apps/meteor/ee/definition/rest/v1/engagementDashboard.ts
@@ -1,6 +1,7 @@
 import type { IDirectMessageRoom, IRoom, IUser } from '@rocket.chat/core-typings';
 
 declare module '@rocket.chat/rest-typings' {
+	// eslint-disable-next-line @typescript-eslint/naming-convention
 	interface Endpoints {
 		'/v1/engagement-dashboard/channels/list': {
 			GET: (params: { start: string; end: string; offset: number; count: number }) => {
diff --git a/apps/meteor/ee/definition/rest/v1/omnichannel/businessHours.ts b/apps/meteor/ee/definition/rest/v1/omnichannel/businessHours.ts
index fbb601d6587..4de8be18bda 100644
--- a/apps/meteor/ee/definition/rest/v1/omnichannel/businessHours.ts
+++ b/apps/meteor/ee/definition/rest/v1/omnichannel/businessHours.ts
@@ -1,6 +1,7 @@
 import type { ILivechatBusinessHour } from '@rocket.chat/core-typings';
 
 declare module '@rocket.chat/rest-typings' {
+	// eslint-disable-next-line @typescript-eslint/naming-convention
 	interface Endpoints {
 		'/v1/livechat/business-hours': {
 			GET: (params: { name?: string; offset: number; count: number; sort: Record<string, unknown> }) => {
diff --git a/apps/meteor/ee/definition/rest/v1/omnichannel/businessUnits.ts b/apps/meteor/ee/definition/rest/v1/omnichannel/businessUnits.ts
index f5b8dd71def..28550e22fb3 100644
--- a/apps/meteor/ee/definition/rest/v1/omnichannel/businessUnits.ts
+++ b/apps/meteor/ee/definition/rest/v1/omnichannel/businessUnits.ts
@@ -2,6 +2,7 @@ import type { ILivechatMonitor, IOmnichannelBusinessUnit } from '@rocket.chat/co
 import type { PaginatedResult } from '@rocket.chat/rest-typings';
 
 declare module '@rocket.chat/rest-typings' {
+	// eslint-disable-next-line @typescript-eslint/naming-convention
 	interface Endpoints {
 		'/v1/livechat/units.list': {
 			GET: (params: { text: string }) => PaginatedResult & {
diff --git a/apps/meteor/ee/definition/rest/v1/omnichannel/cannedResponses.ts b/apps/meteor/ee/definition/rest/v1/omnichannel/cannedResponses.ts
index 0607abaf134..f2c0fd042bf 100644
--- a/apps/meteor/ee/definition/rest/v1/omnichannel/cannedResponses.ts
+++ b/apps/meteor/ee/definition/rest/v1/omnichannel/cannedResponses.ts
@@ -2,6 +2,7 @@ import type { ILivechatDepartment, IOmnichannelCannedResponse, IUser } from '@ro
 import type { PaginatedResult, PaginatedRequest } from '@rocket.chat/rest-typings';
 
 declare module '@rocket.chat/rest-typings' {
+	// eslint-disable-next-line @typescript-eslint/naming-convention
 	interface Endpoints {
 		'/v1/canned-responses': {
 			GET: (
diff --git a/apps/meteor/ee/definition/rest/v1/sessions/index.ts b/apps/meteor/ee/definition/rest/v1/sessions/index.ts
index a734b536606..445c557a74c 100644
--- a/apps/meteor/ee/definition/rest/v1/sessions/index.ts
+++ b/apps/meteor/ee/definition/rest/v1/sessions/index.ts
@@ -1,4 +1,4 @@
-export * from './sessions';
+import './sessions';
 
 export * from './SessionsProps';
 export * from './SessionsPaginateProps';
diff --git a/apps/meteor/ee/definition/rest/v1/sessions/sessions.ts b/apps/meteor/ee/definition/rest/v1/sessions/sessions.ts
index 3893294c7ac..8f006e437af 100644
--- a/apps/meteor/ee/definition/rest/v1/sessions/sessions.ts
+++ b/apps/meteor/ee/definition/rest/v1/sessions/sessions.ts
@@ -5,6 +5,7 @@ import type { SessionsPaginateProps } from './SessionsPaginateProps';
 import type { SessionsProps } from './SessionsProps';
 
 declare module '@rocket.chat/rest-typings' {
+	// eslint-disable-next-line @typescript-eslint/naming-convention
 	interface Endpoints {
 		'/v1/sessions/list': {
 			GET: (params: SessionsPaginateProps) => PaginatedResult<{ sessions: Array<DeviceManagementSession> }>;
diff --git a/apps/meteor/tests/e2e/apps.spec.ts b/apps/meteor/tests/e2e/apps.spec.ts
index 9140cc4ef2c..63c2775d08b 100644
--- a/apps/meteor/tests/e2e/apps.spec.ts
+++ b/apps/meteor/tests/e2e/apps.spec.ts
@@ -8,7 +8,7 @@ const APP_TESTER = {
 
 test.use({ storageState: 'user1-session.json' });
 
-test.describe.parallel('Apps', () => {
+test.describe.serial('Apps', () => {
 	let poHomeChannel: HomeChannel;
 
 	test.beforeAll(async ({ api }) => {
-- 
GitLab