diff --git a/apps/meteor/client/components/Emoji.tsx b/apps/meteor/client/components/Emoji.tsx
index 46e36459537c6..accd2517b20e1 100644
--- a/apps/meteor/client/components/Emoji.tsx
+++ b/apps/meteor/client/components/Emoji.tsx
@@ -1,5 +1,4 @@
 import styled from '@rocket.chat/styled';
-import type { ReactElement } from 'react';
 
 import { getEmojiClassNameAndDataTitle } from '../lib/utils/renderEmoji';
 
@@ -20,7 +19,7 @@ const EmojiComponent = styled('span', ({ fillContainer: _fillContainer, ...props
 			: ''}
 `;
 
-function Emoji({ emojiHandle, className = undefined, fillContainer }: EmojiProps): ReactElement {
+function Emoji({ emojiHandle, className = undefined, fillContainer }: EmojiProps) {
 	const { className: emojiClassName, image, ...props } = getEmojiClassNameAndDataTitle(emojiHandle);
 
 	return (
diff --git a/apps/meteor/client/components/FingerprintChangeModal.tsx b/apps/meteor/client/components/FingerprintChangeModal.tsx
index 066d77334cf44..170451eba0233 100644
--- a/apps/meteor/client/components/FingerprintChangeModal.tsx
+++ b/apps/meteor/client/components/FingerprintChangeModal.tsx
@@ -1,6 +1,5 @@
 import { Box } from '@rocket.chat/fuselage';
 import { ExternalLink, GenericModal } from '@rocket.chat/ui-client';
-import type { ReactElement } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 
 import { links } from '../lib/links';
@@ -11,7 +10,7 @@ type FingerprintChangeModalProps = {
 	onClose: () => void;
 };
 
-const FingerprintChangeModal = ({ onConfirm, onCancel, onClose }: FingerprintChangeModalProps): ReactElement => {
+const FingerprintChangeModal = ({ onConfirm, onCancel, onClose }: FingerprintChangeModalProps) => {
 	const { t } = useTranslation();
 	return (
 		<GenericModal
diff --git a/apps/meteor/client/components/FingerprintChangeModalConfirmation.tsx b/apps/meteor/client/components/FingerprintChangeModalConfirmation.tsx
index ea13e86196857..c2aeb75f30b38 100644
--- a/apps/meteor/client/components/FingerprintChangeModalConfirmation.tsx
+++ b/apps/meteor/client/components/FingerprintChangeModalConfirmation.tsx
@@ -1,6 +1,5 @@
 import { Box } from '@rocket.chat/fuselage';
 import { ExternalLink, GenericModal } from '@rocket.chat/ui-client';
-import type { ReactElement } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 
 import { links } from '../lib/links';
@@ -12,12 +11,7 @@ type FingerprintChangeModalConfirmationProps = {
 	newWorkspace: boolean;
 };
 
-const FingerprintChangeModalConfirmation = ({
-	onConfirm,
-	onCancel,
-	onClose,
-	newWorkspace,
-}: FingerprintChangeModalConfirmationProps): ReactElement => {
+const FingerprintChangeModalConfirmation = ({ onConfirm, onCancel, onClose, newWorkspace }: FingerprintChangeModalConfirmationProps) => {
 	const { t } = useTranslation();
 	return (
 		<GenericModal
diff --git a/apps/meteor/client/components/GazzodownText.tsx b/apps/meteor/client/components/GazzodownText.tsx
index f491b90b41487..61608fc372d57 100644
--- a/apps/meteor/client/components/GazzodownText.tsx
+++ b/apps/meteor/client/components/GazzodownText.tsx
@@ -4,7 +4,7 @@ import type { ChannelMention, UserMention } from '@rocket.chat/gazzodown';
 import { MarkupInteractionContext } from '@rocket.chat/gazzodown';
 import { escapeRegExp } from '@rocket.chat/string-helpers';
 import { useLayout, useRouter, useUserPreference, useUserId, useUserCard } from '@rocket.chat/ui-contexts';
-import type { UIEvent } from 'react';
+import type { UIEvent, ReactNode } from 'react';
 import { useCallback, memo, useMemo } from 'react';
 
 import { normalizeUsername } from '../../lib/utils/normalizeUsername';
@@ -14,7 +14,7 @@ import { useMessageListHighlights, useMessageListShowRealName } from './message/
 import { useGoToRoom } from '../views/room/hooks/useGoToRoom';
 
 type GazzodownTextProps = {
-	children: JSX.Element;
+	children: ReactNode;
 	mentions?: {
 		type?: 'user' | 'team';
 		_id: string;
diff --git a/apps/meteor/client/components/GenericUpsellModal/GenericUpsellModal.tsx b/apps/meteor/client/components/GenericUpsellModal/GenericUpsellModal.tsx
index 0b67d97d91b2b..7602782de43f4 100644
--- a/apps/meteor/client/components/GenericUpsellModal/GenericUpsellModal.tsx
+++ b/apps/meteor/client/components/GenericUpsellModal/GenericUpsellModal.tsx
@@ -1,13 +1,12 @@
 import { Box, ModalHeroImage } from '@rocket.chat/fuselage';
 import { GenericModal } from '@rocket.chat/ui-client';
-import type { ReactElement, ComponentProps } from 'react';
+import type { ComponentProps, ReactNode } from 'react';
 import { useTranslation } from 'react-i18next';
 
 type GenericUpsellModalProps = Omit<ComponentProps<typeof GenericModal>, 'variant' | 'children' | 'onClose' | 'onDismiss'> & {
-	subtitle?: string | ReactElement;
-	description?: string | ReactElement;
+	subtitle?: ReactNode;
+	description?: ReactNode;
 	img: ComponentProps<typeof ModalHeroImage>['src'];
-
 	imgWidth?: ComponentProps<typeof ModalHeroImage>['width'];
 	imgHeight?: ComponentProps<typeof ModalHeroImage>['height'];
 	imgAlt?: string;
diff --git a/apps/meteor/client/components/ListSkeleton.tsx b/apps/meteor/client/components/ListSkeleton.tsx
index 034f167bca0e8..f507ccdd42b0b 100644
--- a/apps/meteor/client/components/ListSkeleton.tsx
+++ b/apps/meteor/client/components/ListSkeleton.tsx
@@ -1,5 +1,4 @@
 import { Box, Skeleton } from '@rocket.chat/fuselage';
-import type { ReactElement } from 'react';
 import { memo, useMemo } from 'react';
 
 const availablePercentualWidths = [47, 68, 75, 82];
@@ -8,7 +7,7 @@ type ListSkeletonProps = {
 	listCount?: number;
 };
 
-const ListSkeleton = ({ listCount = 2 }: ListSkeletonProps): ReactElement => {
+const ListSkeleton = ({ listCount = 2 }: ListSkeletonProps) => {
 	const widths = useMemo(
 		() => Array.from({ length: listCount }, (_, index) => `${availablePercentualWidths[index % availablePercentualWidths.length]}%`),
 		[listCount],
diff --git a/apps/meteor/client/components/LocalTime.tsx b/apps/meteor/client/components/LocalTime.tsx
index be5133050e22b..ded8e707ed4cd 100644
--- a/apps/meteor/client/components/LocalTime.tsx
+++ b/apps/meteor/client/components/LocalTime.tsx
@@ -1,4 +1,3 @@
-import type { ReactElement } from 'react';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -8,7 +7,7 @@ type LocalTimeProps = {
 	utcOffset: number;
 };
 
-const LocalTime = ({ utcOffset }: LocalTimeProps): ReactElement => {
+const LocalTime = ({ utcOffset }: LocalTimeProps) => {
 	const time = useUTCClock(utcOffset);
 	const { t } = useTranslation();
 
diff --git a/apps/meteor/client/components/NotFoundState.tsx b/apps/meteor/client/components/NotFoundState.tsx
index 47911f496b7ec..6fd3fe363807b 100644
--- a/apps/meteor/client/components/NotFoundState.tsx
+++ b/apps/meteor/client/components/NotFoundState.tsx
@@ -1,6 +1,5 @@
 import { Box, States, StatesAction, StatesActions, StatesIcon, StatesSubtitle, StatesTitle } from '@rocket.chat/fuselage';
 import { useRouter } from '@rocket.chat/ui-contexts';
-import type { ReactElement } from 'react';
 import { useTranslation } from 'react-i18next';
 
 type NotFoundProps = {
@@ -8,7 +7,7 @@ type NotFoundProps = {
 	subtitle: string;
 };
 
-const NotFoundState = ({ title, subtitle }: NotFoundProps): ReactElement => {
+const NotFoundState = ({ title, subtitle }: NotFoundProps) => {
 	const { t } = useTranslation();
 	const router = useRouter();
 
diff --git a/apps/meteor/client/components/PageSkeleton.tsx b/apps/meteor/client/components/PageSkeleton.tsx
index ca6b78d3c0257..19f7b682fad55 100644
--- a/apps/meteor/client/components/PageSkeleton.tsx
+++ b/apps/meteor/client/components/PageSkeleton.tsx
@@ -1,8 +1,7 @@
 import { Box, Button, ButtonGroup, Skeleton } from '@rocket.chat/fuselage';
 import { Page, PageHeader, PageContent } from '@rocket.chat/ui-client';
-import type { ReactElement } from 'react';
 
-const PageSkeleton = (): ReactElement => (
+const PageSkeleton = () => (
 	<Page>
 		<PageHeader title={<Skeleton width='x320' maxWidth='full' />}>
 			<ButtonGroup>
diff --git a/apps/meteor/client/components/RawText.tsx b/apps/meteor/client/components/RawText.tsx
index 58ae89e4d041c..975c2100761df 100644
--- a/apps/meteor/client/components/RawText.tsx
+++ b/apps/meteor/client/components/RawText.tsx
@@ -1,9 +1,6 @@
 import DOMPurify from 'dompurify';
-import type { ReactElement } from 'react';
 
 /** @deprecated */
-const RawText = ({ children }: { children: string }): ReactElement => (
-	<span dangerouslySetInnerHTML={{ __html: DOMPurify.sanitize(children) }} />
-);
+const RawText = ({ children }: { children: string }) => <span dangerouslySetInnerHTML={{ __html: DOMPurify.sanitize(children) }} />;
 
 export default RawText;
diff --git a/apps/meteor/client/components/RoomAutoComplete/RoomAutoComplete.tsx b/apps/meteor/client/components/RoomAutoComplete/RoomAutoComplete.tsx
index 5ebc5393b0847..e4e9472464670 100644
--- a/apps/meteor/client/components/RoomAutoComplete/RoomAutoComplete.tsx
+++ b/apps/meteor/client/components/RoomAutoComplete/RoomAutoComplete.tsx
@@ -6,7 +6,7 @@ import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
 import { RoomAvatar } from '@rocket.chat/ui-avatar';
 import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { keepPreviousData, useQuery } from '@tanstack/react-query';
-import type { ReactElement } from 'react';
+import type { ReactNode } from 'react';
 import { forwardRef, memo, useMemo, useState } from 'react';
 
 type LabelType = { name: string; avatarETag?: string; type: IRoom['t']; encrypted?: IRoom['encrypted'] };
@@ -19,7 +19,7 @@ const generateQuery = (
 
 type RoomAutoCompleteProps = Omit<AutoCompleteProps<LabelType>, 'filter'> & {
 	scope?: 'admin' | 'regular';
-	renderRoomIcon?: (props: { encrypted: IRoom['encrypted']; type: IRoom['t'] }) => ReactElement | null;
+	renderRoomIcon?: (props: { encrypted: IRoom['encrypted']; type: IRoom['t'] }) => ReactNode;
 	setSelectedRoom?: (room: IRoom | undefined) => void;
 };
 
diff --git a/apps/meteor/client/components/RoomAutoCompleteMultiple/RoomAutoCompleteMultiple.tsx b/apps/meteor/client/components/RoomAutoCompleteMultiple/RoomAutoCompleteMultiple.tsx
index 401a8879e6093..99d558b72f9d5 100644
--- a/apps/meteor/client/components/RoomAutoCompleteMultiple/RoomAutoCompleteMultiple.tsx
+++ b/apps/meteor/client/components/RoomAutoCompleteMultiple/RoomAutoCompleteMultiple.tsx
@@ -3,7 +3,7 @@ import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
 import { RoomAvatar } from '@rocket.chat/ui-avatar';
 import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { keepPreviousData, useQuery } from '@tanstack/react-query';
-import type { ReactElement, ComponentProps } from 'react';
+import type { ComponentProps } from 'react';
 import { memo, useMemo, useState } from 'react';
 
 const generateQuery = (
@@ -16,7 +16,7 @@ type RoomAutoCompleteProps = Omit<ComponentProps<typeof AutoComplete>, 'filter'>
 	readOnly?: boolean;
 };
 
-const RoomAutoCompleteMultiple = ({ value, onChange, ...props }: RoomAutoCompleteProps): ReactElement => {
+const RoomAutoCompleteMultiple = ({ value, onChange, ...props }: RoomAutoCompleteProps) => {
 	const [filter, setFilter] = useState('');
 	const filterDebounced = useDebouncedValue(filter, 300);
 	const autocomplete = useEndpoint('GET', '/v1/rooms.autocomplete.channelAndPrivate');
@@ -50,7 +50,7 @@ const RoomAutoCompleteMultiple = ({ value, onChange, ...props }: RoomAutoComplet
 			filter={filter}
 			setFilter={setFilter}
 			multiple
-			renderSelected={({ selected: { value, label }, onRemove, ...props }): ReactElement => (
+			renderSelected={({ selected: { value, label }, onRemove, ...props }) => (
 				<Chip {...props} key={value} value={value} onClick={onRemove}>
 					<RoomAvatar size='x20' room={{ ...label, type: label?.type || 'c', _id: value }} />
 					<Box is='span' margin='none' mis={4}>
@@ -58,7 +58,7 @@ const RoomAutoCompleteMultiple = ({ value, onChange, ...props }: RoomAutoComplet
 					</Box>
 				</Chip>
 			)}
-			renderItem={({ value, label, ...props }): ReactElement => (
+			renderItem={({ value, label, ...props }) => (
 				<Option
 					key={value}
 					{...props}
diff --git a/apps/meteor/client/components/RoomIcon/RoomIcon.tsx b/apps/meteor/client/components/RoomIcon/RoomIcon.tsx
index 95d6e3472e9ce..dc715efc6f055 100644
--- a/apps/meteor/client/components/RoomIcon/RoomIcon.tsx
+++ b/apps/meteor/client/components/RoomIcon/RoomIcon.tsx
@@ -1,7 +1,7 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { isOmnichannelRoom } from '@rocket.chat/core-typings';
 import { Icon } from '@rocket.chat/fuselage';
-import type { ComponentProps, ReactElement } from 'react';
+import type { ComponentProps } from 'react';
 import { isValidElement } from 'react';
 
 import { OmnichannelRoomIcon } from './OmnichannelRoomIcon';
@@ -17,7 +17,7 @@ export const RoomIcon = ({
 	size?: ComponentProps<typeof Icon>['size'];
 	isIncomingCall?: boolean;
 	placement?: 'sidebar' | 'default';
-}): ReactElement | null => {
+}) => {
 	const iconPropsOrReactNode = useRoomIcon(room);
 
 	if (isIncomingCall) {
diff --git a/apps/meteor/client/components/Sidebar/ListItem.tsx b/apps/meteor/client/components/Sidebar/ListItem.tsx
index 9bf429b8095f9..5ab5d2a43c743 100644
--- a/apps/meteor/client/components/Sidebar/ListItem.tsx
+++ b/apps/meteor/client/components/Sidebar/ListItem.tsx
@@ -1,5 +1,5 @@
 import { Option, OptionColumn, OptionContent, OptionIcon, OptionInput } from '@rocket.chat/fuselage';
-import type { ComponentProps, ReactElement, ReactNode } from 'react';
+import type { ComponentProps, ReactNode } from 'react';
 
 type ListItemCommonProps = {
 	text: ReactNode;
@@ -20,7 +20,7 @@ type ListItemConditionalProps =
 
 type ListItemProps = ListItemCommonProps & ListItemConditionalProps;
 
-const ListItem = ({ icon, text, input, children, gap, ...props }: ListItemProps): ReactElement => (
+const ListItem = ({ icon, text, input, children, gap, ...props }: ListItemProps) => (
 	<Option {...props}>
 		{icon && <OptionIcon name={icon} />}
 		{gap && <OptionColumn />}
diff --git a/apps/meteor/client/components/Sidebar/SidebarGenericItem.tsx b/apps/meteor/client/components/Sidebar/SidebarGenericItem.tsx
index 1aee93a52c350..f36ec4c773e68 100644
--- a/apps/meteor/client/components/Sidebar/SidebarGenericItem.tsx
+++ b/apps/meteor/client/components/Sidebar/SidebarGenericItem.tsx
@@ -1,5 +1,5 @@
 import { Box, SidebarItem } from '@rocket.chat/fuselage';
-import type { ReactElement, ReactNode } from 'react';
+import type { ReactNode } from 'react';
 import { memo } from 'react';
 
 type SidebarGenericItemProps = {
@@ -10,7 +10,7 @@ type SidebarGenericItemProps = {
 	externalUrl?: boolean;
 };
 
-const SidebarGenericItem = ({ href, active, externalUrl, children, ...props }: SidebarGenericItemProps): ReactElement => (
+const SidebarGenericItem = ({ href, active, externalUrl, children, ...props }: SidebarGenericItemProps) => (
 	<SidebarItem
 		selected={active}
 		clickable
diff --git a/apps/meteor/client/components/SidebarToggler/SidebarToggler.tsx b/apps/meteor/client/components/SidebarToggler/SidebarToggler.tsx
index 033c4065a2e4d..0f85b447d2fdf 100644
--- a/apps/meteor/client/components/SidebarToggler/SidebarToggler.tsx
+++ b/apps/meteor/client/components/SidebarToggler/SidebarToggler.tsx
@@ -1,12 +1,11 @@
 import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
 import { useEmbeddedLayout } from '@rocket.chat/ui-client';
 import { useLayout, useSession } from '@rocket.chat/ui-contexts';
-import type { ReactElement } from 'react';
 import { memo } from 'react';
 
 import SidebarTogglerButton from './SidebarTogglerButton';
 
-const SideBarToggler = (): ReactElement => {
+const SideBarToggler = () => {
 	const { sidebar } = useLayout();
 	const isLayoutEmbedded = useEmbeddedLayout();
 	const unreadMessagesBadge = useSession('unread') as number | string | undefined;
diff --git a/apps/meteor/client/components/Skeleton.tsx b/apps/meteor/client/components/Skeleton.tsx
index fbebdc0f71539..2c534ca4874f8 100644
--- a/apps/meteor/client/components/Skeleton.tsx
+++ b/apps/meteor/client/components/Skeleton.tsx
@@ -1,7 +1,7 @@
 import { Box, Skeleton } from '@rocket.chat/fuselage';
-import type { ComponentProps, ReactElement } from 'react';
+import type { ComponentProps } from 'react';
 
-export const FormSkeleton = (props: ComponentProps<typeof Box>): ReactElement => (
+export const FormSkeleton = (props: ComponentProps<typeof Box>) => (
 	<Box w='full' pb={24} {...props}>
 		<Skeleton mbe={8} />
 		<Skeleton mbe={4} />
diff --git a/apps/meteor/client/components/TextCopy.tsx b/apps/meteor/client/components/TextCopy.tsx
index 3a6481ec7ce43..4328288cf08db 100644
--- a/apps/meteor/client/components/TextCopy.tsx
+++ b/apps/meteor/client/components/TextCopy.tsx
@@ -1,10 +1,10 @@
 import { Box, Button, Scrollable } from '@rocket.chat/fuselage';
-import type { ComponentProps, ReactElement } from 'react';
+import type { ComponentProps, ReactNode } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import useClipboardWithToast from '../hooks/useClipboardWithToast';
 
-const defaultWrapperRenderer = (text: string): ReactElement => (
+const defaultWrapperRenderer = (text: string) => (
 	<Box fontFamily='mono' alignSelf='center' fontScale='p2' style={{ wordBreak: 'break-all' }} mie={4} flexGrow={1} maxHeight='x108'>
 		{text}
 	</Box>
@@ -12,10 +12,10 @@ const defaultWrapperRenderer = (text: string): ReactElement => (
 
 type TextCopyProps = {
 	text: string;
-	wrapper?: (text: string) => ReactElement;
+	wrapper?: (text: string) => ReactNode;
 } & ComponentProps<typeof Box>;
 
-const TextCopy = ({ text, wrapper = defaultWrapperRenderer, ...props }: TextCopyProps): ReactElement => {
+const TextCopy = ({ text, wrapper = defaultWrapperRenderer, ...props }: TextCopyProps) => {
 	const { t } = useTranslation();
 
 	const { copy } = useClipboardWithToast(text);
diff --git a/apps/meteor/client/components/TwoFactorModal/TwoFactorEmailModal.tsx b/apps/meteor/client/components/TwoFactorModal/TwoFactorEmailModal.tsx
index c80fb09e78ae1..7c5e8e6ec94ab 100644
--- a/apps/meteor/client/components/TwoFactorModal/TwoFactorEmailModal.tsx
+++ b/apps/meteor/client/components/TwoFactorModal/TwoFactorEmailModal.tsx
@@ -2,7 +2,6 @@ import { Box, Button } from '@rocket.chat/fuselage';
 import { FieldGroup, TextInput, Field, FieldLabel, FieldRow, FieldError } from '@rocket.chat/fuselage-forms';
 import { GenericModal } from '@rocket.chat/ui-client';
 import { useToastMessageDispatch, useEndpoint } from '@rocket.chat/ui-contexts';
-import type { ReactElement } from 'react';
 import { useForm, Controller } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 
@@ -19,7 +18,7 @@ type TwoFactorEmailFormData = {
 	code: string;
 };
 
-const TwoFactorEmailModal = ({ onConfirm, onClose, emailOrUsername }: TwoFactorEmailModalProps): ReactElement => {
+const TwoFactorEmailModal = ({ onConfirm, onClose, emailOrUsername }: TwoFactorEmailModalProps) => {
 	const dispatchToastMessage = useToastMessageDispatch();
 	const { t } = useTranslation();
 
diff --git a/apps/meteor/client/components/TwoFactorModal/TwoFactorModal.tsx b/apps/meteor/client/components/TwoFactorModal/TwoFactorModal.tsx
index ef056ee717ccb..ffcbcd865ea7b 100644
--- a/apps/meteor/client/components/TwoFactorModal/TwoFactorModal.tsx
+++ b/apps/meteor/client/components/TwoFactorModal/TwoFactorModal.tsx
@@ -1,5 +1,3 @@
-import type { ReactElement } from 'react';
-
 import TwoFactorEmail from './TwoFactorEmailModal';
 import TwoFactorPassword from './TwoFactorPasswordModal';
 import TwoFactorTotp from './TwoFactorTotpModal';
@@ -25,7 +23,7 @@ type TwoFactorModalProps = {
 	  }
 );
 
-const TwoFactorModal = ({ onConfirm, onClose, ...props }: TwoFactorModalProps): ReactElement => {
+const TwoFactorModal = ({ onConfirm, onClose, ...props }: TwoFactorModalProps) => {
 	if (props.method === Method.TOTP) {
 		return <TwoFactorTotp onConfirm={onConfirm} onClose={onClose} />;
 	}
diff --git a/apps/meteor/client/components/TwoFactorModal/TwoFactorPasswordModal.tsx b/apps/meteor/client/components/TwoFactorModal/TwoFactorPasswordModal.tsx
index 8e3911e141e46..7100f58fbcd01 100644
--- a/apps/meteor/client/components/TwoFactorModal/TwoFactorPasswordModal.tsx
+++ b/apps/meteor/client/components/TwoFactorModal/TwoFactorPasswordModal.tsx
@@ -1,7 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
 import { PasswordInput, FieldGroup, Field, FieldLabel, FieldRow, FieldError } from '@rocket.chat/fuselage-forms';
 import { GenericModal } from '@rocket.chat/ui-client';
-import type { ReactElement } from 'react';
 import { useForm, Controller } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 
@@ -17,7 +16,7 @@ type TwoFactorPasswordFormData = {
 	password: string;
 };
 
-const TwoFactorPasswordModal = ({ onConfirm, onClose }: TwoFactorPasswordModalProps): ReactElement => {
+const TwoFactorPasswordModal = ({ onConfirm, onClose }: TwoFactorPasswordModalProps) => {
 	const { t } = useTranslation();
 
 	const {
diff --git a/apps/meteor/client/components/TwoFactorModal/TwoFactorTotpModal.tsx b/apps/meteor/client/components/TwoFactorModal/TwoFactorTotpModal.tsx
index 6ecb111d81538..3eb2a7f62004d 100644
--- a/apps/meteor/client/components/TwoFactorModal/TwoFactorTotpModal.tsx
+++ b/apps/meteor/client/components/TwoFactorModal/TwoFactorTotpModal.tsx
@@ -1,7 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
 import { FieldGroup, TextInput, Field, FieldLabel, FieldRow, FieldError } from '@rocket.chat/fuselage-forms';
 import { GenericModal } from '@rocket.chat/ui-client';
-import type { ReactElement } from 'react';
 import { useForm, Controller } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 
@@ -18,7 +17,7 @@ type TwoFactorTotpFormData = {
 	code: string;
 };
 
-const TwoFactorTotpModal = ({ onConfirm, onClose, onDismiss }: TwoFactorTotpModalProps): ReactElement => {
+const TwoFactorTotpModal = ({ onConfirm, onClose, onDismiss }: TwoFactorTotpModalProps) => {
 	const { t } = useTranslation();
 
 	const {
diff --git a/apps/meteor/client/components/UTCClock.tsx b/apps/meteor/client/components/UTCClock.tsx
index fc484940f6eb1..2e4cda3963e88 100644
--- a/apps/meteor/client/components/UTCClock.tsx
+++ b/apps/meteor/client/components/UTCClock.tsx
@@ -1,4 +1,3 @@
-import type { ReactElement } from 'react';
 import { memo } from 'react';
 
 import { useUTCClock } from '../hooks/useUTCClock';
@@ -7,7 +6,7 @@ type UTCClockProps = {
 	utcOffset: number;
 };
 
-const UTCClock = ({ utcOffset }: UTCClockProps): ReactElement => {
+const UTCClock = ({ utcOffset }: UTCClockProps) => {
 	const time = useUTCClock(utcOffset);
 
 	return <>{time}</>;
diff --git a/apps/meteor/client/components/UrlChangeModal.tsx b/apps/meteor/client/components/UrlChangeModal.tsx
index 8b5a8194a54b0..9347f524feafc 100644
--- a/apps/meteor/client/components/UrlChangeModal.tsx
+++ b/apps/meteor/client/components/UrlChangeModal.tsx
@@ -1,7 +1,6 @@
 import { Box } from '@rocket.chat/fuselage';
 import { GenericModal } from '@rocket.chat/ui-client';
 import DOMPurify from 'dompurify';
-import type { ReactElement } from 'react';
 import { useTranslation } from 'react-i18next';
 
 type UrlChangeModalProps = {
@@ -11,7 +10,7 @@ type UrlChangeModalProps = {
 	onClose: () => void;
 };
 
-const UrlChangeModal = ({ onConfirm, siteUrl, currentUrl, onClose }: UrlChangeModalProps): ReactElement => {
+const UrlChangeModal = ({ onConfirm, siteUrl, currentUrl, onClose }: UrlChangeModalProps) => {
 	const { t } = useTranslation();
 	return (
 		<GenericModal variant='warning' title={t('Warning')} onConfirm={onConfirm} onClose={onClose} onCancel={onClose} confirmText={t('Yes')}>
diff --git a/apps/meteor/client/components/UserAndRoomAutoCompleteMultiple/UserAndRoomAutoCompleteMultiple.tsx b/apps/meteor/client/components/UserAndRoomAutoCompleteMultiple/UserAndRoomAutoCompleteMultiple.tsx
index 132faf03e2e5c..fe0937b2ed657 100644
--- a/apps/meteor/client/components/UserAndRoomAutoCompleteMultiple/UserAndRoomAutoCompleteMultiple.tsx
+++ b/apps/meteor/client/components/UserAndRoomAutoCompleteMultiple/UserAndRoomAutoCompleteMultiple.tsx
@@ -4,7 +4,7 @@ import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
 import { escapeRegExp } from '@rocket.chat/string-helpers';
 import { RoomAvatar } from '@rocket.chat/ui-avatar';
 import { useUser, useUserSubscriptions } from '@rocket.chat/ui-contexts';
-import type { ComponentProps, ReactElement } from 'react';
+import type { ComponentProps } from 'react';
 import { memo, useMemo, useState } from 'react';
 
 import { roomCoordinator } from '../../lib/rooms/roomCoordinator';
@@ -80,7 +80,7 @@ const UserAndRoomAutoCompleteMultiple = ({ value, onChange, limit, ...props }: U
 			filter={filter}
 			setFilter={setFilter}
 			multiple
-			renderSelected={({ selected: { value, label }, onRemove, ...props }): ReactElement => (
+			renderSelected={({ selected: { value, label }, onRemove, ...props }) => (
 				<Chip {...props} height='x20' value={value} onClick={onRemove} mie={4}>
 					<RoomAvatar size='x20' room={{ ...label, _id: value }} />
 					<Box is='span' margin='none' mis={4}>
diff --git a/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultipleOptions.tsx b/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultipleOptions.tsx
index 084bd3a4e388b..77861195c24bd 100644
--- a/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultipleOptions.tsx
+++ b/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultipleOptions.tsx
@@ -1,6 +1,6 @@
 import type { OptionType } from '@rocket.chat/fuselage';
 import { Options } from '@rocket.chat/fuselage';
-import type { ComponentProps, ReactElement, Ref } from 'react';
+import type { ComponentProps, Ref } from 'react';
 import { forwardRef, createContext, useContext } from 'react';
 
 import UserAutoCompleteMultipleOption from './UserAutoCompleteMultipleOption';
@@ -25,7 +25,7 @@ export const OptionsContext = createContext<OptionsContextValue>({
 const UserAutoCompleteMultipleOptions = forwardRef(function UserAutoCompleteMultipleOptions(
 	{ onSelect, ...props }: ComponentProps<typeof Options>,
 	ref: Ref<HTMLElement>,
-): ReactElement {
+) {
 	const { options } = useContext(OptionsContext);
 	return (
 		<Options
diff --git a/apps/meteor/client/components/UserCard/UserCardAction.tsx b/apps/meteor/client/components/UserCard/UserCardAction.tsx
index dfe3dfd26ebe3..64522bfa88d43 100644
--- a/apps/meteor/client/components/UserCard/UserCardAction.tsx
+++ b/apps/meteor/client/components/UserCard/UserCardAction.tsx
@@ -1,10 +1,8 @@
 import { IconButton } from '@rocket.chat/fuselage';
-import type { ReactElement, ComponentProps } from 'react';
+import type { ComponentProps } from 'react';
 
 type UserCardActionProps = ComponentProps<typeof IconButton>;
 
-const UserCardAction = ({ label, icon, ...props }: UserCardActionProps): ReactElement => (
-	<IconButton icon={icon} small title={label} {...props} />
-);
+const UserCardAction = ({ label, icon, ...props }: UserCardActionProps) => <IconButton icon={icon} small title={label} {...props} />;
 
 export default UserCardAction;
diff --git a/apps/meteor/client/components/UserCard/UserCardActions.tsx b/apps/meteor/client/components/UserCard/UserCardActions.tsx
index 3ce2f03829ea1..01f9c0a6986a3 100644
--- a/apps/meteor/client/components/UserCard/UserCardActions.tsx
+++ b/apps/meteor/client/components/UserCard/UserCardActions.tsx
@@ -1,11 +1,11 @@
 import { useToolbar } from '@react-aria/toolbar';
 import { ButtonGroup } from '@rocket.chat/fuselage';
-import type { ReactElement, ComponentProps } from 'react';
+import type { ComponentProps } from 'react';
 import { useRef } from 'react';
 
 type UserCardActionsProps = ComponentProps<typeof ButtonGroup>;
 
-const UserCardActions = (props: UserCardActionsProps): ReactElement => {
+const UserCardActions = (props: UserCardActionsProps) => {
 	const ref = useRef<HTMLDivElement>(null);
 	const { toolbarProps } = useToolbar(props, ref);
 
diff --git a/apps/meteor/client/components/UserCard/UserCardInfo.tsx b/apps/meteor/client/components/UserCard/UserCardInfo.tsx
index 446e8c1dc6555..65b2b8bda8dcc 100644
--- a/apps/meteor/client/components/UserCard/UserCardInfo.tsx
+++ b/apps/meteor/client/components/UserCard/UserCardInfo.tsx
@@ -1,7 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
-import type { ReactElement, ComponentProps } from 'react';
+import type { ComponentProps } from 'react';
 
-const UserCardInfo = (props: ComponentProps<typeof Box>): ReactElement => (
+const UserCardInfo = (props: ComponentProps<typeof Box>) => (
 	<Box mb={8} 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 6687e4eb430b1..542990704d4ad 100644
--- a/apps/meteor/client/components/UserCard/UserCardRole.tsx
+++ b/apps/meteor/client/components/UserCard/UserCardRole.tsx
@@ -1,7 +1,7 @@
 import { Box, Tag } from '@rocket.chat/fuselage';
-import type { ReactNode, ReactElement } from 'react';
+import type { ReactNode } from 'react';
 
-const UserCardRole = ({ children }: { children: ReactNode }): ReactElement => (
+const UserCardRole = ({ children }: { children: ReactNode }) => (
 	<Box m={2} fontScale='c2'>
 		<Tag>{children}</Tag>
 	</Box>
diff --git a/apps/meteor/client/components/UserCard/UserCardRoles.tsx b/apps/meteor/client/components/UserCard/UserCardRoles.tsx
index 521344f53016e..1077a6ee911fc 100644
--- a/apps/meteor/client/components/UserCard/UserCardRoles.tsx
+++ b/apps/meteor/client/components/UserCard/UserCardRoles.tsx
@@ -1,9 +1,9 @@
 import { Box } from '@rocket.chat/fuselage';
-import type { ReactNode, ReactElement } from 'react';
+import type { ReactNode } from 'react';
 
 import UserCardInfo from './UserCardInfo';
 
-const UserCardRoles = ({ children }: { children: ReactNode }): ReactElement => (
+const UserCardRoles = ({ children }: { children: ReactNode }) => (
 	<Box m='neg-x2'>
 		<UserCardInfo flexWrap='wrap' display='flex' flexShrink={0}>
 			{children}
diff --git a/apps/meteor/client/components/UserCard/UserCardUsername.tsx b/apps/meteor/client/components/UserCard/UserCardUsername.tsx
index 6926a45664612..cf54660d5748e 100644
--- a/apps/meteor/client/components/UserCard/UserCardUsername.tsx
+++ b/apps/meteor/client/components/UserCard/UserCardUsername.tsx
@@ -1,5 +1,5 @@
 import { Box } from '@rocket.chat/fuselage';
-import type { ReactElement, ReactNode, ComponentProps } from 'react';
+import type { ReactNode, ComponentProps } from 'react';
 
 import * as UserStatus from '../UserStatus';
 
@@ -8,7 +8,7 @@ type UserCardUsernameProps = ComponentProps<typeof Box> & {
 	status: ReactNode;
 };
 
-const UserCardUsername = ({ name, status = <UserStatus.Offline />, ...props }: UserCardUsernameProps): ReactElement => (
+const UserCardUsername = ({ name, status = <UserStatus.Offline />, ...props }: UserCardUsernameProps) => (
 	<Box
 		display='flex'
 		title={name}
diff --git a/apps/meteor/client/components/UserInfo/UserInfo.tsx b/apps/meteor/client/components/UserInfo/UserInfo.tsx
index 1f32888e901cf..1fabbdb131ed6 100644
--- a/apps/meteor/client/components/UserInfo/UserInfo.tsx
+++ b/apps/meteor/client/components/UserInfo/UserInfo.tsx
@@ -13,7 +13,7 @@ import {
 	InfoPanelTitle,
 } from '@rocket.chat/ui-client';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import type { ReactElement, ReactNode } from 'react';
+import type { ReactNode } from 'react';
 import { memo, useId } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -49,8 +49,8 @@ type UserInfoProps = UserInfoDataProps & {
 	status: ReactNode;
 	email?: string;
 	verified?: boolean;
-	actions: ReactElement;
-	roles: ReactElement[];
+	actions: ReactNode;
+	roles: ReactNode[];
 	reason?: string;
 	invitationDate?: string;
 };
@@ -78,7 +78,7 @@ const UserInfo = ({
 	abacAttributes,
 	invitationDate,
 	...props
-}: UserInfoProps): ReactElement => {
+}: UserInfoProps) => {
 	const { t } = useTranslation();
 	const timeAgo = useTimeAgo();
 	const userDisplayName = useUserDisplayName({ name, username });
diff --git a/apps/meteor/client/components/UserInfo/UserInfoAction.tsx b/apps/meteor/client/components/UserInfo/UserInfoAction.tsx
index 1ab2965268d11..4507ef10e1985 100644
--- a/apps/meteor/client/components/UserInfo/UserInfoAction.tsx
+++ b/apps/meteor/client/components/UserInfo/UserInfoAction.tsx
@@ -1,12 +1,12 @@
 import { Button, IconButton } from '@rocket.chat/fuselage';
 import type { Keys as IconName } from '@rocket.chat/icons';
-import type { ReactElement, ComponentProps } from 'react';
+import type { ComponentProps } from 'react';
 
 type UserInfoActionProps = {
 	icon: IconName;
 } & ComponentProps<typeof Button>;
 
-const UserInfoAction = ({ icon, label, title, ...props }: UserInfoActionProps): ReactElement => {
+const UserInfoAction = ({ icon, label, title, ...props }: UserInfoActionProps) => {
 	if (!label && icon && title) {
 		return <IconButton small secondary icon={icon} title={title} aria-label={title} {...props} mi={4} size={40} />;
 	}
diff --git a/apps/meteor/client/components/UserInfo/UserInfoAvatar.tsx b/apps/meteor/client/components/UserInfo/UserInfoAvatar.tsx
index 91bed51ac19b9..cbe879937b486 100644
--- a/apps/meteor/client/components/UserInfo/UserInfoAvatar.tsx
+++ b/apps/meteor/client/components/UserInfo/UserInfoAvatar.tsx
@@ -1,6 +1,6 @@
 import { UserAvatar } from '@rocket.chat/ui-avatar';
-import type { ComponentProps, ReactElement } from 'react';
+import type { ComponentProps } from 'react';
 
-const UserInfoAvatar = (props: ComponentProps<typeof UserAvatar>): ReactElement => <UserAvatar size='x332' {...props} />;
+const UserInfoAvatar = (props: ComponentProps<typeof UserAvatar>) => <UserAvatar size='x332' {...props} />;
 
 export default UserInfoAvatar;
diff --git a/apps/meteor/client/components/UserInfo/UserInfoUsername.tsx b/apps/meteor/client/components/UserInfo/UserInfoUsername.tsx
index ece8f78a03619..93a24895d89a2 100644
--- a/apps/meteor/client/components/UserInfo/UserInfoUsername.tsx
+++ b/apps/meteor/client/components/UserInfo/UserInfoUsername.tsx
@@ -1,15 +1,15 @@
 import type { IUser } from '@rocket.chat/core-typings';
 import type { Box } from '@rocket.chat/fuselage';
-import type { ReactElement, ComponentProps } from 'react';
+import type { ComponentProps, ReactNode } from 'react';
 
 import { UserCardUsername } from '../UserCard';
 
 type UserInfoUsernameProps = {
 	username: IUser['username'];
-	status: ReactElement;
+	status: ReactNode;
 } & ComponentProps<typeof Box>;
 
-const UserInfoUsername = ({ username, status, ...props }: UserInfoUsernameProps): ReactElement => (
+const UserInfoUsername = ({ username, status, ...props }: UserInfoUsernameProps) => (
 	<UserCardUsername name={username} status={status} {...props} />
 );
 
diff --git a/apps/meteor/client/components/UserStatus/ReactiveUserStatus.tsx b/apps/meteor/client/components/UserStatus/ReactiveUserStatus.tsx
index 51b683b608e4d..332acbe8fc9d4 100644
--- a/apps/meteor/client/components/UserStatus/ReactiveUserStatus.tsx
+++ b/apps/meteor/client/components/UserStatus/ReactiveUserStatus.tsx
@@ -1,14 +1,14 @@
 import type { IUser } from '@rocket.chat/core-typings';
 import { UserStatus } from '@rocket.chat/ui-client';
 import { useUserPresence } from '@rocket.chat/ui-contexts';
-import type { ComponentProps, ReactElement } from 'react';
+import type { ComponentProps } from 'react';
 import { memo } from 'react';
 
 type ReactiveUserStatusProps = {
 	uid: IUser['_id'];
 } & ComponentProps<typeof UserStatus.UserStatus>;
 
-const ReactiveUserStatus = ({ uid, ...props }: ReactiveUserStatusProps): ReactElement => {
+const ReactiveUserStatus = ({ uid, ...props }: ReactiveUserStatusProps) => {
 	const status = useUserPresence(uid)?.status;
 	return <UserStatus.UserStatus status={status} {...props} />;
 };
diff --git a/apps/meteor/client/components/UserStatusMenu.tsx b/apps/meteor/client/components/UserStatusMenu.tsx
index 7aa1d8be1fbed..26d78e2c6a32d 100644
--- a/apps/meteor/client/components/UserStatusMenu.tsx
+++ b/apps/meteor/client/components/UserStatusMenu.tsx
@@ -2,7 +2,7 @@ import { UserStatus as UserStatusType } from '@rocket.chat/core-typings';
 import type { OptionType } from '@rocket.chat/fuselage';
 import { Button, PositionAnimated, Options, useCursor, Box } from '@rocket.chat/fuselage';
 import { useSetting } from '@rocket.chat/ui-contexts';
-import type { ReactElement, ComponentProps } from 'react';
+import type { ComponentProps, ReactNode } from 'react';
 import { useRef, useCallback, useState, useMemo, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -22,13 +22,13 @@ const UserStatusMenu = ({
 	initialStatus = UserStatusType.OFFLINE,
 	optionWidth = undefined,
 	placement = 'bottom-end',
-}: UserStatusMenuProps): ReactElement => {
+}: UserStatusMenuProps) => {
 	const { t } = useTranslation();
 	const [status, setStatus] = useState(initialStatus);
 	const allowInvisibleStatus = useSetting('Accounts_AllowInvisibleStatusOption', true);
 
 	const options = useMemo(() => {
-		const renderOption = (status: UserStatusType, label: string): ReactElement => (
+		const renderOption = (status: UserStatusType, label: string) => (
 			<Box display='flex' flexDirection='row' alignItems='center'>
 				<Box marginInlineEnd={8}>
 					<UserStatus status={status} />
@@ -37,7 +37,7 @@ const UserStatusMenu = ({
 			</Box>
 		);
 
-		const statuses: Array<[value: UserStatusType, label: ReactElement]> = [
+		const statuses: Array<[value: UserStatusType, label: ReactNode]> = [
 			[UserStatusType.ONLINE, renderOption(UserStatusType.ONLINE, t('Online'))],
 			[UserStatusType.AWAY, renderOption(UserStatusType.AWAY, t('Away'))],
 			[UserStatusType.BUSY, renderOption(UserStatusType.BUSY, t('Busy'))],
diff --git a/apps/meteor/client/components/WarningModal.tsx b/apps/meteor/client/components/WarningModal.tsx
index 3bcf4f7deed1c..5c28cd705d51b 100644
--- a/apps/meteor/client/components/WarningModal.tsx
+++ b/apps/meteor/client/components/WarningModal.tsx
@@ -9,7 +9,7 @@ import {
 	ModalIcon,
 	ModalTitle,
 } from '@rocket.chat/fuselage';
-import type { ReactElement, ReactNode } from 'react';
+import type { ReactNode } from 'react';
 import { useTranslation } from 'react-i18next';
 
 type WarningModalProps = {
@@ -21,7 +21,7 @@ type WarningModalProps = {
 	close: () => void;
 };
 
-const WarningModal = ({ text, confirmText, close, cancel, cancelText, confirm, ...props }: WarningModalProps): ReactElement => {
+const WarningModal = ({ text, confirmText, close, cancel, cancelText, confirm, ...props }: WarningModalProps) => {
 	const { t } = useTranslation();
 	return (
 		<Modal open {...props}>
diff --git a/apps/meteor/client/components/avatar/RoomAvatarEditor.tsx b/apps/meteor/client/components/avatar/RoomAvatarEditor.tsx
index 189dcd77e6c63..db85d7b774a21 100644
--- a/apps/meteor/client/components/avatar/RoomAvatarEditor.tsx
+++ b/apps/meteor/client/components/avatar/RoomAvatarEditor.tsx
@@ -20,7 +20,7 @@ type RoomAvatarEditorProps = {
 	onChangeAvatar: (url: string | null) => void;
 };
 
-const RoomAvatarEditor = ({ disabled = false, room, roomAvatar, onChangeAvatar }: RoomAvatarEditorProps): ReactElement => {
+const RoomAvatarEditor = ({ disabled = false, room, roomAvatar, onChangeAvatar }: RoomAvatarEditorProps): ReactElement<any> => {
 	const { t } = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 
diff --git a/apps/meteor/client/components/avatar/UserAvatarEditor/UserAvatarEditor.tsx b/apps/meteor/client/components/avatar/UserAvatarEditor/UserAvatarEditor.tsx
index 8b10bbb3d9ccc..9694a3ad4f549 100644
--- a/apps/meteor/client/components/avatar/UserAvatarEditor/UserAvatarEditor.tsx
+++ b/apps/meteor/client/components/avatar/UserAvatarEditor/UserAvatarEditor.tsx
@@ -23,7 +23,7 @@ type UserAvatarEditorProps = {
 	name: IUser['name'];
 };
 
-function UserAvatarEditor({ currentUsername, username, setAvatarObj, name, disabled, etag }: UserAvatarEditorProps): ReactElement {
+function UserAvatarEditor({ currentUsername, username, setAvatarObj, name, disabled, etag }: UserAvatarEditorProps): ReactElement<any> {
 	const { t } = useTranslation();
 	const useFullNameForDefaultAvatar = useSetting('UI_Use_Name_Avatar');
 	const rotateImages = useSetting('FileUpload_RotateImages');
diff --git a/apps/meteor/client/components/connectionStatus/useReconnectCountdown.ts b/apps/meteor/client/components/connectionStatus/useReconnectCountdown.ts
index d7abc8da585a5..d0cc2f94b1ca5 100644
--- a/apps/meteor/client/components/connectionStatus/useReconnectCountdown.ts
+++ b/apps/meteor/client/components/connectionStatus/useReconnectCountdown.ts
@@ -9,7 +9,7 @@ export const useReconnectCountdown = (
 	retryTime: number | undefined,
 	status: 'connected' | 'connecting' | 'failed' | 'waiting' | 'offline',
 ): number => {
-	const reconnectionTimerRef = useRef<ReturnType<typeof setInterval>>();
+	const reconnectionTimerRef = useRef<ReturnType<typeof setInterval>>(undefined);
 	const [reconnectCountdown, setReconnectCountdown] = useState(() => (retryTime ? getReconnectCountdown(retryTime) : 0));
 
 	useEffect(() => {
diff --git a/apps/meteor/client/components/dashboards/DownloadDataButton.tsx b/apps/meteor/client/components/dashboards/DownloadDataButton.tsx
index 80ec55b4dce83..1c737ddb3430b 100644
--- a/apps/meteor/client/components/dashboards/DownloadDataButton.tsx
+++ b/apps/meteor/client/components/dashboards/DownloadDataButton.tsx
@@ -1,7 +1,7 @@
 import type { Box } from '@rocket.chat/fuselage';
 import { IconButton } from '@rocket.chat/fuselage';
 import { useToastMessageDispatch } from '@rocket.chat/ui-contexts';
-import type { ComponentProps, ReactElement } from 'react';
+import type { ComponentProps } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { downloadCsvAs } from '../../lib/download';
@@ -23,7 +23,7 @@ const DownloadDataButton = <H extends readonly string[]>({
 	dataAvailable,
 	dataExtractor,
 	...props
-}: DownloadDataButtonProps<H>): ReactElement => {
+}: DownloadDataButtonProps<H>) => {
 	const { t } = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 
diff --git a/apps/meteor/client/components/dashboards/PeriodSelector.tsx b/apps/meteor/client/components/dashboards/PeriodSelector.tsx
index e83b0b18933df..df1bd1329c565 100644
--- a/apps/meteor/client/components/dashboards/PeriodSelector.tsx
+++ b/apps/meteor/client/components/dashboards/PeriodSelector.tsx
@@ -1,5 +1,4 @@
 import { Select } from '@rocket.chat/fuselage';
-import type { ReactElement } from 'react';
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -13,7 +12,7 @@ type PeriodSelectorProps<TPeriod extends Period['key']> = {
 	onChange: (value: TPeriod) => void;
 };
 
-const PeriodSelector = <TPeriod extends Period['key']>({ periods, value, name, onChange }: PeriodSelectorProps<TPeriod>): ReactElement => {
+const PeriodSelector = <TPeriod extends Period['key']>({ periods, value, name, onChange }: PeriodSelectorProps<TPeriod>) => {
 	const { t } = useTranslation();
 
 	const options = useMemo<[string, string][]>(() => periods.map((period) => [period, t(...getPeriod(period).label)]), [periods, t]);
diff --git a/apps/meteor/client/components/dataView/Counter.tsx b/apps/meteor/client/components/dataView/Counter.tsx
index 089605194a470..a4e45ae5752f1 100644
--- a/apps/meteor/client/components/dataView/Counter.tsx
+++ b/apps/meteor/client/components/dataView/Counter.tsx
@@ -1,5 +1,5 @@
 import { Box, Flex, Margins } from '@rocket.chat/fuselage';
-import type { ReactElement, ReactNode } from 'react';
+import type { ReactNode } from 'react';
 
 import Growth from './Growth';
 
@@ -9,7 +9,7 @@ type CounterProps = {
 	description?: ReactNode;
 };
 
-const Counter = ({ count, variation = 0, description }: CounterProps): ReactElement => (
+const Counter = ({ count, variation = 0, description }: CounterProps) => (
 	<>
 		<Flex.Container alignItems='end'>
 			<Box>
diff --git a/apps/meteor/client/components/dataView/CounterSet.tsx b/apps/meteor/client/components/dataView/CounterSet.tsx
index fba48421d444e..d34ed677fb2ff 100644
--- a/apps/meteor/client/components/dataView/CounterSet.tsx
+++ b/apps/meteor/client/components/dataView/CounterSet.tsx
@@ -1,5 +1,5 @@
 import { Grid, GridItem } from '@rocket.chat/fuselage';
-import type { ReactElement, ReactNode } from 'react';
+import type { ReactNode } from 'react';
 
 import Counter from './Counter';
 
@@ -11,7 +11,7 @@ type CounterSetProps = {
 	}[];
 };
 
-const CounterSet = ({ counters = [] }: CounterSetProps): ReactElement => (
+const CounterSet = ({ counters = [] }: CounterSetProps) => (
 	<Grid>
 		{counters.map(({ count, variation, description }, i) => (
 			<GridItem key={i}>
diff --git a/apps/meteor/client/components/dataView/Growth.tsx b/apps/meteor/client/components/dataView/Growth.tsx
index e5ec40af2d490..581faa797043d 100644
--- a/apps/meteor/client/components/dataView/Growth.tsx
+++ b/apps/meteor/client/components/dataView/Growth.tsx
@@ -1,5 +1,5 @@
 import { Box } from '@rocket.chat/fuselage';
-import type { ComponentProps, ReactElement } from 'react';
+import type { ComponentProps } from 'react';
 
 import NegativeGrowthSymbol from './NegativeGrowthSymbol';
 import PositiveGrowthSymbol from './PositiveGrowthSymbol';
@@ -8,7 +8,7 @@ type GrowthProps = ComponentProps<typeof Box> & {
 	children: number;
 };
 
-const Growth = ({ children, ...props }: GrowthProps): ReactElement | null => {
+const Growth = ({ children, ...props }: GrowthProps) => {
 	if (children === 0) {
 		return null;
 	}
diff --git a/apps/meteor/client/components/dataView/NegativeGrowthSymbol.tsx b/apps/meteor/client/components/dataView/NegativeGrowthSymbol.tsx
index 99c97a0a45145..630eddfda3afc 100644
--- a/apps/meteor/client/components/dataView/NegativeGrowthSymbol.tsx
+++ b/apps/meteor/client/components/dataView/NegativeGrowthSymbol.tsx
@@ -1,10 +1,10 @@
-import type { ComponentProps, ReactElement } from 'react';
+import type { ComponentProps } from 'react';
 
 const style = { width: '1.5em', height: '1.5em', verticalAlign: '-0.5em' };
 
 type NegativeGrowthSymbolProps = Omit<ComponentProps<'svg'>, 'style'>;
 
-const NegativeGrowthSymbol = (props: NegativeGrowthSymbolProps): ReactElement => (
+const NegativeGrowthSymbol = (props: NegativeGrowthSymbolProps) => (
 	<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 25 24' style={style} {...props}>
 		<path
 			clipRule='evenodd'
diff --git a/apps/meteor/client/components/dataView/PositiveGrowthSymbol.tsx b/apps/meteor/client/components/dataView/PositiveGrowthSymbol.tsx
index 94016621b39a5..32c0529b337ff 100644
--- a/apps/meteor/client/components/dataView/PositiveGrowthSymbol.tsx
+++ b/apps/meteor/client/components/dataView/PositiveGrowthSymbol.tsx
@@ -1,10 +1,10 @@
-import type { ComponentProps, ReactElement } from 'react';
+import type { ComponentProps } from 'react';
 
 const style = { width: '1.5em', height: '1.5em', verticalAlign: '-0.5em' };
 
 type PositiveGrowthSymbolProps = Omit<ComponentProps<'svg'>, 'style'>;
 
-const PositiveGrowthSymbol = (props: PositiveGrowthSymbolProps): ReactElement => (
+const PositiveGrowthSymbol = (props: PositiveGrowthSymbolProps) => (
 	<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' style={style} {...props}>
 		<path
 			clipRule='evenodd'
diff --git a/apps/meteor/client/components/deviceManagement/DeviceIcon.tsx b/apps/meteor/client/components/deviceManagement/DeviceIcon.tsx
index 51611df5e5ae7..3f7310386a2f5 100644
--- a/apps/meteor/client/components/deviceManagement/DeviceIcon.tsx
+++ b/apps/meteor/client/components/deviceManagement/DeviceIcon.tsx
@@ -1,6 +1,5 @@
 import { Box, Icon } from '@rocket.chat/fuselage';
 import type { Keys as IconName } from '@rocket.chat/icons';
-import type { ReactElement } from 'react';
 
 const iconMap: Record<string, IconName> = {
 	'browser': 'desktop',
@@ -9,7 +8,7 @@ const iconMap: Record<string, IconName> = {
 	'mobile-app': 'mobile',
 };
 
-const DeviceIcon = ({ deviceType }: { deviceType: string }): ReactElement => (
+const DeviceIcon = ({ deviceType }: { deviceType: string }) => (
 	<Box
 		is='span'
 		display='inline-flex'
diff --git a/apps/meteor/client/components/deviceManagement/DeviceManagementTable/DeviceManagementTable.tsx b/apps/meteor/client/components/deviceManagement/DeviceManagementTable/DeviceManagementTable.tsx
index 5a5fed3389854..ec792ca9049d3 100644
--- a/apps/meteor/client/components/deviceManagement/DeviceManagementTable/DeviceManagementTable.tsx
+++ b/apps/meteor/client/components/deviceManagement/DeviceManagementTable/DeviceManagementTable.tsx
@@ -3,7 +3,7 @@ import { Box, Pagination, States, StatesAction, StatesActions, StatesIcon, State
 import type { PaginatedResult } from '@rocket.chat/rest-typings';
 import { GenericTable, GenericTableHeader, GenericTableBody, GenericTableLoadingTable } from '@rocket.chat/ui-client';
 import type { UseQueryResult } from '@tanstack/react-query';
-import type { ComponentProps, ReactElement } from 'react';
+import type { ComponentProps, ReactNode } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import GenericNoResults from '../../GenericNoResults/GenericNoResults';
@@ -11,8 +11,8 @@ import GenericNoResults from '../../GenericNoResults/GenericNoResults';
 // FIXME: this tight coupling with the query result is not ideal; it indicates visual components should not be tightly
 // coupled with data fetching logic.
 type DeviceManagementTableProps<T> = UseQueryResult<PaginatedResult<{ sessions: Serialized<T>[] }>> & {
-	headers: (ReactElement | false)[];
-	renderRow: (data: Serialized<T>) => ReactElement;
+	headers: ReactNode[];
+	renderRow: (data: Serialized<T>) => ReactNode;
 	current?: ComponentProps<typeof Pagination>['current'];
 	itemsPerPage?: ComponentProps<typeof Pagination>['itemsPerPage'];
 	setCurrent?: ComponentProps<typeof Pagination>['onSetCurrent'];
@@ -35,7 +35,7 @@ const DeviceManagementTable = <T extends DeviceManagementSession | DeviceManagem
 	setCurrent,
 	setItemsPerPage,
 	paginationProps,
-}: DeviceManagementTableProps<T>): ReactElement => {
+}: DeviceManagementTableProps<T>) => {
 	const { t } = useTranslation();
 
 	if (isError) {
diff --git a/apps/meteor/client/components/deviceManagement/LoggedOutBanner.tsx b/apps/meteor/client/components/deviceManagement/LoggedOutBanner.tsx
index f5515438e08f9..747ffa003e132 100644
--- a/apps/meteor/client/components/deviceManagement/LoggedOutBanner.tsx
+++ b/apps/meteor/client/components/deviceManagement/LoggedOutBanner.tsx
@@ -1,8 +1,7 @@
 import { Banner, Box, Icon } from '@rocket.chat/fuselage';
-import type { ReactElement } from 'react';
 import { useTranslation } from 'react-i18next';
 
-const LoggedOutBanner = (): ReactElement => {
+const LoggedOutBanner = () => {
 	const { t } = useTranslation();
 
 	return (
diff --git a/apps/meteor/client/components/message/IgnoredContent.tsx b/apps/meteor/client/components/message/IgnoredContent.tsx
index 8508d58677e5d..fb840ce4ef5cb 100644
--- a/apps/meteor/client/components/message/IgnoredContent.tsx
+++ b/apps/meteor/client/components/message/IgnoredContent.tsx
@@ -1,5 +1,5 @@
 import { Box, Icon, MessageBody } from '@rocket.chat/fuselage';
-import type { ReactElement, SyntheticEvent } from 'react';
+import type { SyntheticEvent } from 'react';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -8,7 +8,7 @@ type IgnoredContentProps = {
 	onShowMessageIgnored: () => void;
 };
 
-const IgnoredContent = ({ messageId, onShowMessageIgnored }: IgnoredContentProps): ReactElement => {
+const IgnoredContent = ({ messageId, onShowMessageIgnored }: IgnoredContentProps) => {
 	const { t } = useTranslation();
 
 	const showMessageIgnored = (event: SyntheticEvent): void => {
diff --git a/apps/meteor/client/components/message/MessageCollapsible.tsx b/apps/meteor/client/components/message/MessageCollapsible.tsx
index a949be34e379e..a350cb10262cd 100644
--- a/apps/meteor/client/components/message/MessageCollapsible.tsx
+++ b/apps/meteor/client/components/message/MessageCollapsible.tsx
@@ -1,5 +1,5 @@
 import { Box } from '@rocket.chat/fuselage';
-import type { ReactElement, ReactNode } from 'react';
+import type { ReactNode } from 'react';
 
 import AttachmentDownload from './content/attachments/structure/AttachmentDownload';
 import AttachmentSize from './content/attachments/structure/AttachmentSize';
@@ -14,7 +14,7 @@ type MessageCollapsibleProps = {
 	isCollapsed?: boolean;
 };
 
-const MessageCollapsible = ({ children, title, hasDownload, link, size, isCollapsed }: MessageCollapsibleProps): ReactElement => {
+const MessageCollapsible = ({ children, title, hasDownload, link, size, isCollapsed }: MessageCollapsibleProps) => {
 	const [collapsed, collapse] = useCollapse(isCollapsed);
 
 	return (
diff --git a/apps/meteor/client/components/message/MessageHeader.tsx b/apps/meteor/client/components/message/MessageHeader.tsx
index 53f740e2d817e..3ad8f64743d59 100644
--- a/apps/meteor/client/components/message/MessageHeader.tsx
+++ b/apps/meteor/client/components/message/MessageHeader.tsx
@@ -10,7 +10,6 @@ import {
 import { useButtonPattern } from '@rocket.chat/fuselage-hooks';
 import { useUserDisplayName } from '@rocket.chat/ui-client';
 import { useUserPresence, useUserCard } from '@rocket.chat/ui-contexts';
-import type { ReactElement } from 'react';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -30,7 +29,7 @@ type MessageHeaderProps = {
 	message: IMessage;
 };
 
-const MessageHeader = ({ message }: MessageHeaderProps): ReactElement => {
+const MessageHeader = ({ message }: MessageHeaderProps) => {
 	const { t } = useTranslation();
 
 	const formatTime = useMessageListFormatTime();
diff --git a/apps/meteor/client/components/message/MessageToolbarHolder.tsx b/apps/meteor/client/components/message/MessageToolbarHolder.tsx
index e1b65b3d0dd78..ad10e3b4763a5 100644
--- a/apps/meteor/client/components/message/MessageToolbarHolder.tsx
+++ b/apps/meteor/client/components/message/MessageToolbarHolder.tsx
@@ -1,7 +1,6 @@
 import type { IMessage } from '@rocket.chat/core-typings';
 import { MessageToolbarWrapper } from '@rocket.chat/fuselage';
 import { useQuery } from '@tanstack/react-query';
-import type { ReactElement } from 'react';
 import { Suspense, lazy, memo, useState } from 'react';
 
 import type { MessageActionContext } from '../../../app/ui-utils/client/lib/MessageAction';
@@ -15,7 +14,7 @@ type MessageToolbarHolderProps = {
 
 const MessageToolbar = lazy(() => import('./toolbar/MessageToolbar'));
 
-const MessageToolbarHolder = ({ message, context }: MessageToolbarHolderProps): ReactElement => {
+const MessageToolbarHolder = ({ message, context }: MessageToolbarHolderProps) => {
 	const chat = useChat();
 	const [ref, isVisible] = useIsVisible();
 	const [isToolbarMenuOpen, setIsToolbarMenuOpen] = useState(false);
diff --git a/apps/meteor/client/components/message/ReadReceiptIndicator.tsx b/apps/meteor/client/components/message/ReadReceiptIndicator.tsx
index 610dc58212614..9f0904089306e 100644
--- a/apps/meteor/client/components/message/ReadReceiptIndicator.tsx
+++ b/apps/meteor/client/components/message/ReadReceiptIndicator.tsx
@@ -1,6 +1,5 @@
 import type { IMessage } from '@rocket.chat/core-typings';
 import { Box, Icon } from '@rocket.chat/fuselage';
-import type { ReactElement } from 'react';
 import { useTranslation } from 'react-i18next';
 
 type ReadReceiptIndicatorProps = {
@@ -8,7 +7,7 @@ type ReadReceiptIndicatorProps = {
 	unread?: boolean;
 };
 
-const ReadReceiptIndicator = ({ mid, unread }: ReadReceiptIndicatorProps): ReactElement | null => {
+const ReadReceiptIndicator = ({ mid, unread }: ReadReceiptIndicatorProps) => {
 	const { t } = useTranslation();
 
 	return (
diff --git a/apps/meteor/client/components/message/StatusIndicators.tsx b/apps/meteor/client/components/message/StatusIndicators.tsx
index 30aa5d992e72e..fe5e08c640dce 100644
--- a/apps/meteor/client/components/message/StatusIndicators.tsx
+++ b/apps/meteor/client/components/message/StatusIndicators.tsx
@@ -2,7 +2,6 @@ import type { IMessage, ITranslatedMessage } from '@rocket.chat/core-typings';
 import { isEditedMessage, isE2EEMessage, isE2EEPinnedMessage } from '@rocket.chat/core-typings';
 import { MessageStatusIndicator, MessageStatusIndicatorItem } from '@rocket.chat/fuselage';
 import { useUserId } from '@rocket.chat/ui-contexts';
-import type { ReactElement } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { useMessageDateFormatter, useShowStarred, useShowTranslated, useShowFollowing } from './list/MessageListContext';
@@ -11,7 +10,7 @@ type StatusIndicatorsProps = {
 	message: IMessage & Partial<ITranslatedMessage>;
 };
 
-const StatusIndicators = ({ message }: StatusIndicatorsProps): ReactElement => {
+const StatusIndicators = ({ message }: StatusIndicatorsProps) => {
 	const { t } = useTranslation();
 	const translated = useShowTranslated(message);
 	const starred = useShowStarred({ message });
diff --git a/apps/meteor/client/components/message/content/Action.tsx b/apps/meteor/client/components/message/content/Action.tsx
index a59eb659c861a..c6d6de8d69844 100644
--- a/apps/meteor/client/components/message/content/Action.tsx
+++ b/apps/meteor/client/components/message/content/Action.tsx
@@ -1,8 +1,8 @@
 import { IconButton } from '@rocket.chat/fuselage';
-import type { ComponentProps, ReactElement } from 'react';
+import type { ComponentProps } from 'react';
 
 type ActionProps = ComponentProps<typeof IconButton> & { icon: string };
 
-const Action = (props: ActionProps): ReactElement => <IconButton mi={2} mini {...props} />;
+const Action = (props: ActionProps) => <IconButton mi={2} mini {...props} />;
 
 export default Action;
diff --git a/apps/meteor/client/components/message/content/Attachments.tsx b/apps/meteor/client/components/message/content/Attachments.tsx
index 946febe58cb94..d97270b01cf0b 100644
--- a/apps/meteor/client/components/message/content/Attachments.tsx
+++ b/apps/meteor/client/components/message/content/Attachments.tsx
@@ -1,5 +1,4 @@
 import type { MessageAttachmentBase } from '@rocket.chat/core-typings';
-import type { ReactElement } from 'react';
 
 import AttachmentsItem from './attachments/AttachmentsItem';
 
@@ -8,7 +7,7 @@ type AttachmentsProps = {
 	id?: string | undefined;
 };
 
-const Attachments = ({ attachments, id }: AttachmentsProps): ReactElement => {
+const Attachments = ({ attachments, id }: AttachmentsProps) => {
 	return <>{attachments?.map((attachment, index) => <AttachmentsItem key={index} id={id} attachment={{ ...attachment }} />)}</>;
 };
 
diff --git a/apps/meteor/client/components/message/content/BroadcastMetrics.tsx b/apps/meteor/client/components/message/content/BroadcastMetrics.tsx
index 9be0ce674deb7..9cf92afb1c01a 100644
--- a/apps/meteor/client/components/message/content/BroadcastMetrics.tsx
+++ b/apps/meteor/client/components/message/content/BroadcastMetrics.tsx
@@ -1,6 +1,5 @@
 import type { IMessage } from '@rocket.chat/core-typings';
 import { MessageBlock, MessageMetrics, MessageMetricsReply } from '@rocket.chat/fuselage';
-import type { ReactElement } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { useChat } from '../../../views/room/contexts/ChatContext';
@@ -10,7 +9,7 @@ type BroadcastMetricsProps = {
 	message: IMessage;
 };
 
-const BroadcastMetrics = ({ username, message }: BroadcastMetricsProps): ReactElement => {
+const BroadcastMetrics = ({ username, message }: BroadcastMetricsProps) => {
 	const { t } = useTranslation();
 
 	const chat = useChat();
diff --git a/apps/meteor/client/components/message/content/DiscussionMetrics.tsx b/apps/meteor/client/components/message/content/DiscussionMetrics.tsx
index efcb9f06393da..f7b6f53349a38 100644
--- a/apps/meteor/client/components/message/content/DiscussionMetrics.tsx
+++ b/apps/meteor/client/components/message/content/DiscussionMetrics.tsx
@@ -6,7 +6,6 @@ import {
 	MessageMetricsItemLabel,
 	MessageMetricsReply,
 } from '@rocket.chat/fuselage';
-import type { ReactElement } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { useTimeAgo } from '../../../hooks/useTimeAgo';
@@ -19,7 +18,7 @@ type DiscussionMetricsProps = {
 	lm?: Date;
 };
 
-const DiscussionMetrics = ({ lm, count, rid, drid }: DiscussionMetricsProps): ReactElement => {
+const DiscussionMetrics = ({ lm, count, rid, drid }: DiscussionMetricsProps) => {
 	const { t } = useTranslation();
 	const format = useTimeAgo();
 
diff --git a/apps/meteor/client/components/message/content/Location.tsx b/apps/meteor/client/components/message/content/Location.tsx
index b17d615341b07..c4d70e6bd1c3e 100644
--- a/apps/meteor/client/components/message/content/Location.tsx
+++ b/apps/meteor/client/components/message/content/Location.tsx
@@ -1,5 +1,4 @@
 import type { IMessage } from '@rocket.chat/core-typings';
-import type { ReactElement } from 'react';
 
 import MapView from './location/MapView';
 
@@ -7,7 +6,7 @@ type LocationProps = {
 	location?: IMessage['location'];
 };
 
-const Location = ({ location }: LocationProps): ReactElement | null => {
+const Location = ({ location }: LocationProps) => {
 	const [longitude, latitude] = location?.coordinates ?? [];
 
 	if (!latitude || !longitude) {
diff --git a/apps/meteor/client/components/message/content/MessageActions.tsx b/apps/meteor/client/components/message/content/MessageActions.tsx
index 0433f796ea022..b67538962e26c 100644
--- a/apps/meteor/client/components/message/content/MessageActions.tsx
+++ b/apps/meteor/client/components/message/content/MessageActions.tsx
@@ -3,7 +3,6 @@ import { Box, ButtonGroup } from '@rocket.chat/fuselage';
 import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
 import type { Keys as IconName } from '@rocket.chat/icons';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import type { ReactElement } from 'react';
 
 import MessageAction from './actions/MessageAction';
 import { actionLinks } from '../../../lib/actionLinks';
@@ -22,7 +21,7 @@ type MessageActionsProps = {
 	actions: MessageActionOptions[];
 };
 
-const MessageActions = ({ message, actions }: MessageActionsProps): ReactElement => {
+const MessageActions = ({ message, actions }: MessageActionsProps) => {
 	const runAction = useEffectEvent((action: string) => () => {
 		actionLinks.run(action, message);
 	});
diff --git a/apps/meteor/client/components/message/content/Reactions.tsx b/apps/meteor/client/components/message/content/Reactions.tsx
index 8365e8bae115e..029699f7661de 100644
--- a/apps/meteor/client/components/message/content/Reactions.tsx
+++ b/apps/meteor/client/components/message/content/Reactions.tsx
@@ -2,7 +2,7 @@ import { useToolbar } from '@react-aria/toolbar';
 import type { IMessage } from '@rocket.chat/core-typings';
 import { MessageReactions, MessageReactionAction } from '@rocket.chat/fuselage';
 import { useButtonPattern } from '@rocket.chat/fuselage-hooks';
-import type { HTMLAttributes, ReactElement } from 'react';
+import type { HTMLAttributes } from 'react';
 import { useContext, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -14,7 +14,7 @@ type ReactionsProps = {
 	message: IMessage;
 } & HTMLAttributes<HTMLDivElement>;
 
-const Reactions = ({ message, ...props }: ReactionsProps): ReactElement => {
+const Reactions = ({ message, ...props }: ReactionsProps) => {
 	const { t } = useTranslation();
 	const ref = useRef(null);
 	const hasReacted = useUserHasReacted(message);
diff --git a/apps/meteor/client/components/message/content/ThreadMetrics.tsx b/apps/meteor/client/components/message/content/ThreadMetrics.tsx
index cac74f3f6c1da..e9f4724af07e2 100644
--- a/apps/meteor/client/components/message/content/ThreadMetrics.tsx
+++ b/apps/meteor/client/components/message/content/ThreadMetrics.tsx
@@ -7,7 +7,6 @@ import {
 	MessageMetricsItemLabel,
 } from '@rocket.chat/fuselage';
 import { useResizeObserver } from '@rocket.chat/fuselage-hooks';
-import type { ReactElement } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import ThreadMetricsFollow from './ThreadMetricsFollow';
@@ -27,7 +26,7 @@ type ThreadMetricsProps = {
 	following: boolean;
 };
 
-const ThreadMetrics = ({ unread, mention, all, rid, mid, counter, participants, following, lm }: ThreadMetricsProps): ReactElement => {
+const ThreadMetrics = ({ unread, mention, all, rid, mid, counter, participants, following, lm }: ThreadMetricsProps) => {
 	const { t } = useTranslation();
 
 	const format = useTimeAgo();
diff --git a/apps/meteor/client/components/message/content/ThreadMetricsFollow.tsx b/apps/meteor/client/components/message/content/ThreadMetricsFollow.tsx
index 5b0efbef082c9..f5363f3558a34 100644
--- a/apps/meteor/client/components/message/content/ThreadMetricsFollow.tsx
+++ b/apps/meteor/client/components/message/content/ThreadMetricsFollow.tsx
@@ -1,7 +1,7 @@
 import type { IMessage } from '@rocket.chat/core-typings';
 import { MessageMetricsItem, MessageMetricsFollowing } from '@rocket.chat/fuselage';
 import { useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
-import type { MouseEvent, ReactElement } from 'react';
+import type { MouseEvent } from 'react';
 import { useCallback } from 'react';
 
 import ThreadMetricsBadge from './ThreadMetricsUnreadBadge';
@@ -16,7 +16,7 @@ type ThreadMetricsFollowProps = {
 	all: boolean;
 };
 
-const ThreadMetricsFollow = ({ following, mid, rid, unread, mention, all }: ThreadMetricsFollowProps): ReactElement => {
+const ThreadMetricsFollow = ({ following, mid, rid, unread, mention, all }: ThreadMetricsFollowProps) => {
 	const t = useTranslation();
 
 	const dispatchToastMessage = useToastMessageDispatch();
diff --git a/apps/meteor/client/components/message/content/ThreadMetricsParticipants.tsx b/apps/meteor/client/components/message/content/ThreadMetricsParticipants.tsx
index 5a4c6ccc3a783..d65727a43a4d2 100644
--- a/apps/meteor/client/components/message/content/ThreadMetricsParticipants.tsx
+++ b/apps/meteor/client/components/message/content/ThreadMetricsParticipants.tsx
@@ -7,13 +7,12 @@ import {
 } from '@rocket.chat/fuselage';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
 import { useTranslation, useUserPreference } from '@rocket.chat/ui-contexts';
-import type { ReactElement } from 'react';
 
 type ThreadMetricsParticipantsProps = {
 	participants: Array<string>;
 };
 
-const ThreadMetricsParticipants = ({ participants }: ThreadMetricsParticipantsProps): ReactElement => {
+const ThreadMetricsParticipants = ({ participants }: ThreadMetricsParticipantsProps) => {
 	const t = useTranslation();
 
 	const hideAvatar = !useUserPreference('displayAvatars');
diff --git a/apps/meteor/client/components/message/content/UrlPreviews.tsx b/apps/meteor/client/components/message/content/UrlPreviews.tsx
index a6a5c3a387433..11e5e1c5c72c6 100644
--- a/apps/meteor/client/components/message/content/UrlPreviews.tsx
+++ b/apps/meteor/client/components/message/content/UrlPreviews.tsx
@@ -1,6 +1,5 @@
 import type { IMessage } from '@rocket.chat/core-typings';
 import { MessageBlock } from '@rocket.chat/fuselage';
-import type { ReactElement } from 'react';
 
 import { useOembedLayout } from '../hooks/useOembedLayout';
 import type { OEmbedPreviewMetadata } from './urlPreviews/OEmbedPreviewMetadata';
@@ -107,7 +106,7 @@ const isMetaPreview = (_data: PreviewData['data'], type: PreviewTypes): _data is
 
 type UrlPreviewsProps = { urls: OembedUrlLegacy[] };
 
-const UrlPreviews = ({ urls }: UrlPreviewsProps): ReactElement | null => {
+const UrlPreviews = ({ urls }: UrlPreviewsProps) => {
 	const { maxWidth: oembedMaxWidth } = useOembedLayout();
 	const metaAndHeaders = urls.map(processMetaAndHeaders).filter(isPreviewData);
 
diff --git a/apps/meteor/client/components/message/content/actions/MessageAction.tsx b/apps/meteor/client/components/message/content/actions/MessageAction.tsx
index 66fb7e70ad2f5..c03f1f8a92596 100644
--- a/apps/meteor/client/components/message/content/actions/MessageAction.tsx
+++ b/apps/meteor/client/components/message/content/actions/MessageAction.tsx
@@ -1,7 +1,6 @@
 import { Button } from '@rocket.chat/fuselage';
 import type { Keys as IconName } from '@rocket.chat/icons';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import type { ReactElement } from 'react';
 import { useTranslation } from 'react-i18next';
 
 const resolveLegacyIcon = (legacyIcon: IconName | `icon-${IconName | 'videocam'}`): IconName => {
@@ -21,7 +20,7 @@ type MessageActionProps = {
 	danger?: boolean;
 };
 
-const MessageAction = ({ icon, methodId, i18nLabel, label, runAction, danger }: MessageActionProps): ReactElement => {
+const MessageAction = ({ icon, methodId, i18nLabel, label, runAction, danger }: MessageActionProps) => {
 	const { t } = useTranslation();
 
 	const resolvedIcon = resolveLegacyIcon(icon);
diff --git a/apps/meteor/client/components/message/content/attachments/AttachmentsItem.tsx b/apps/meteor/client/components/message/content/attachments/AttachmentsItem.tsx
index 2780d58ee36f2..f71afab03b05a 100644
--- a/apps/meteor/client/components/message/content/attachments/AttachmentsItem.tsx
+++ b/apps/meteor/client/components/message/content/attachments/AttachmentsItem.tsx
@@ -1,6 +1,5 @@
 import type { MessageAttachmentBase } from '@rocket.chat/core-typings';
 import { isFileAttachment, isQuoteAttachment } from '@rocket.chat/core-typings';
-import type { ReactElement } from 'react';
 import { memo } from 'react';
 
 import DefaultAttachment from './DefaultAttachment';
@@ -12,7 +11,7 @@ type AttachmentsItemProps = {
 	id: string | undefined;
 };
 
-const AttachmentsItem = ({ attachment, id }: AttachmentsItemProps): ReactElement => {
+const AttachmentsItem = ({ attachment, id }: AttachmentsItemProps) => {
 	if (isFileAttachment(attachment)) {
 		return <FileAttachment id={id} {...attachment} />;
 	}
diff --git a/apps/meteor/client/components/message/content/attachments/DefaultAttachment.tsx b/apps/meteor/client/components/message/content/attachments/DefaultAttachment.tsx
index 2776c1ea81d81..fcf7d33ca70ca 100644
--- a/apps/meteor/client/components/message/content/attachments/DefaultAttachment.tsx
+++ b/apps/meteor/client/components/message/content/attachments/DefaultAttachment.tsx
@@ -1,6 +1,6 @@
 import type { MarkdownFields, MessageAttachmentDefault } from '@rocket.chat/core-typings';
 import { isActionAttachment } from '@rocket.chat/core-typings';
-import type { ReactNode, ComponentProps, ReactElement } from 'react';
+import type { ReactNode, ComponentProps } from 'react';
 
 import { ActionAttachment } from './default/ActionAttachtment';
 import FieldsAttachment from './default/FieldsAttachment';
@@ -26,7 +26,7 @@ const applyMarkdownIfRequires = (
 
 type DefaultAttachmentProps = MessageAttachmentDefault;
 
-const DefaultAttachment = (attachment: DefaultAttachmentProps): ReactElement => {
+const DefaultAttachment = (attachment: DefaultAttachmentProps) => {
 	const [collapsed, collapse] = useCollapse(!!attachment.collapsed);
 
 	return (
diff --git a/apps/meteor/client/components/message/content/attachments/QuoteAttachment.tsx b/apps/meteor/client/components/message/content/attachments/QuoteAttachment.tsx
index 2a4f975c6641a..a0262fa84096e 100644
--- a/apps/meteor/client/components/message/content/attachments/QuoteAttachment.tsx
+++ b/apps/meteor/client/components/message/content/attachments/QuoteAttachment.tsx
@@ -2,7 +2,6 @@ import type { MessageQuoteAttachment } from '@rocket.chat/core-typings';
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Palette } from '@rocket.chat/fuselage';
 import { useUserPreference } from '@rocket.chat/ui-contexts';
-import type { ReactElement } from 'react';
 
 import { useTimeAgo } from '../../../../hooks/useTimeAgo';
 import MessageContentBody from '../../MessageContentBody';
@@ -35,7 +34,7 @@ type QuoteAttachmentProps = {
 	attachment: MessageQuoteAttachment;
 };
 
-export const QuoteAttachment = ({ attachment }: QuoteAttachmentProps): ReactElement => {
+export const QuoteAttachment = ({ attachment }: QuoteAttachmentProps) => {
 	const formatTime = useTimeAgo();
 	const displayAvatarPreference = useUserPreference<boolean>('displayAvatars');
 
diff --git a/apps/meteor/client/components/message/content/attachments/default/ActionAttachmentButton.tsx b/apps/meteor/client/components/message/content/attachments/default/ActionAttachmentButton.tsx
index d0eddb046bce9..3ff0ec57284c3 100644
--- a/apps/meteor/client/components/message/content/attachments/default/ActionAttachmentButton.tsx
+++ b/apps/meteor/client/components/message/content/attachments/default/ActionAttachmentButton.tsx
@@ -1,7 +1,7 @@
 import type { IMessage, MessageAttachmentAction } from '@rocket.chat/core-typings';
 import { Button } from '@rocket.chat/fuselage';
 import { useToastMessageDispatch } from '@rocket.chat/ui-contexts';
-import type { ReactElement, ReactNode } from 'react';
+import type { ReactNode } from 'react';
 
 import { usePerformActionMutation } from './hooks/usePerformActionMutation';
 
@@ -14,7 +14,7 @@ type ActionAttachmentButtonProps = {
 	processingType: ProcessingType;
 };
 
-const ActionAttachmentButton = ({ children, processingType, msg, mid }: ActionAttachmentButtonProps): ReactElement => {
+const ActionAttachmentButton = ({ children, processingType, msg, mid }: ActionAttachmentButtonProps) => {
 	const dispatchToastMessage = useToastMessageDispatch();
 
 	const performActionMutation = usePerformActionMutation({
diff --git a/apps/meteor/client/components/message/content/attachments/structure/AttachmentAuthorAvatar.tsx b/apps/meteor/client/components/message/content/attachments/structure/AttachmentAuthorAvatar.tsx
index 6fc38a3290069..c2ee400d6d5cf 100644
--- a/apps/meteor/client/components/message/content/attachments/structure/AttachmentAuthorAvatar.tsx
+++ b/apps/meteor/client/components/message/content/attachments/structure/AttachmentAuthorAvatar.tsx
@@ -1,6 +1,5 @@
 import { BaseAvatar } from '@rocket.chat/ui-avatar';
-import type { ReactElement } from 'react';
 
-const AttachmentAuthorAvatar = ({ url }: { url: string }): ReactElement => <BaseAvatar url={url} size='x24' />;
+const AttachmentAuthorAvatar = ({ url }: { url: string }) => <BaseAvatar url={url} size='x24' />;
 
 export default AttachmentAuthorAvatar;
diff --git a/apps/meteor/client/components/message/content/collapsible/CollapsibleContent.tsx b/apps/meteor/client/components/message/content/collapsible/CollapsibleContent.tsx
index 854a144429315..8cba240ba31a0 100644
--- a/apps/meteor/client/components/message/content/collapsible/CollapsibleContent.tsx
+++ b/apps/meteor/client/components/message/content/collapsible/CollapsibleContent.tsx
@@ -1,11 +1,11 @@
-import type { ComponentProps, ReactElement } from 'react';
+import type { ComponentProps } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import Action from '../Action';
 
 type CollapsibleContentProps = Omit<ComponentProps<typeof Action>, 'icon'> & { collapsed?: boolean };
 
-const CollapsibleContent = ({ collapsed = false, ...props }: CollapsibleContentProps): ReactElement => {
+const CollapsibleContent = ({ collapsed = false, ...props }: CollapsibleContentProps) => {
 	const { t } = useTranslation();
 	return <Action title={collapsed ? t('Uncollapse') : t('Collapse')} icon={!collapsed ? 'chevron-down' : 'chevron-left'} {...props} />;
 };
diff --git a/apps/meteor/client/components/message/content/reactions/Reaction.tsx b/apps/meteor/client/components/message/content/reactions/Reaction.tsx
index fd0302bef8bf6..511d347b37931 100644
--- a/apps/meteor/client/components/message/content/reactions/Reaction.tsx
+++ b/apps/meteor/client/components/message/content/reactions/Reaction.tsx
@@ -1,7 +1,7 @@
 import { MessageReaction as MessageReactionTemplate, MessageReactionEmoji, MessageReactionCounter } from '@rocket.chat/fuselage';
 import { useButtonPattern } from '@rocket.chat/fuselage-hooks';
 import { useTooltipClose, useTooltipOpen } from '@rocket.chat/ui-contexts';
-import type { ComponentProps, ReactElement } from 'react';
+import type { ComponentProps } from 'react';
 import { useRef, useContext } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -22,7 +22,7 @@ type ReactionProps = {
 	onClick: () => void;
 } & ComponentProps<typeof MessageReactionTemplate>;
 
-const Reaction = ({ hasReacted, counter, name, names, messageId, onClick, ...props }: ReactionProps): ReactElement => {
+const Reaction = ({ hasReacted, counter, name, names, messageId, onClick, ...props }: ReactionProps) => {
 	const { t } = useTranslation();
 	const ref = useRef<HTMLDivElement>(null);
 	const openTooltip = useTooltipOpen();
diff --git a/apps/meteor/client/components/message/content/urlPreviews/OEmbedCollapsible.tsx b/apps/meteor/client/components/message/content/urlPreviews/OEmbedCollapsible.tsx
index 12977c0545c78..68a05a11f3495 100644
--- a/apps/meteor/client/components/message/content/urlPreviews/OEmbedCollapsible.tsx
+++ b/apps/meteor/client/components/message/content/urlPreviews/OEmbedCollapsible.tsx
@@ -1,5 +1,5 @@
 import { MessageGenericPreview } from '@rocket.chat/fuselage';
-import type { ReactElement, ReactNode } from 'react';
+import type { ReactNode } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import OEmbedPreviewContent from './OEmbedPreviewContent';
@@ -8,7 +8,7 @@ import MessageCollapsible from '../../MessageCollapsible';
 
 type OEmbedCollapsibleProps = { children?: ReactNode } & OEmbedPreviewMetadata;
 
-const OEmbedCollapsible = ({ children, ...props }: OEmbedCollapsibleProps): ReactElement => {
+const OEmbedCollapsible = ({ children, ...props }: OEmbedCollapsibleProps) => {
 	const { t } = useTranslation();
 
 	return (
diff --git a/apps/meteor/client/components/message/content/urlPreviews/OEmbedHtmlPreview.tsx b/apps/meteor/client/components/message/content/urlPreviews/OEmbedHtmlPreview.tsx
index be1b8e93608ff..483f553c01a2b 100644
--- a/apps/meteor/client/components/message/content/urlPreviews/OEmbedHtmlPreview.tsx
+++ b/apps/meteor/client/components/message/content/urlPreviews/OEmbedHtmlPreview.tsx
@@ -1,6 +1,5 @@
 import { Box } from '@rocket.chat/fuselage';
 import DOMPurify from 'dompurify';
-import type { ReactElement } from 'react';
 
 import OEmbedCollapsible from './OEmbedCollapsible';
 import type { OEmbedPreviewMetadata } from './OEmbedPreviewMetadata';
@@ -11,7 +10,7 @@ const purifyOptions = {
 	ALLOW_UNKNOWN_PROTOCOLS: true,
 };
 
-const OEmbedHtmlPreview = ({ html, ...props }: OEmbedPreviewMetadata): ReactElement => (
+const OEmbedHtmlPreview = ({ html, ...props }: OEmbedPreviewMetadata) => (
 	<OEmbedCollapsible {...props}>
 		{html && <Box withRichContent dangerouslySetInnerHTML={{ __html: DOMPurify.sanitize(html, purifyOptions) }} />}
 	</OEmbedCollapsible>
diff --git a/apps/meteor/client/components/message/content/urlPreviews/OEmbedImagePreview.tsx b/apps/meteor/client/components/message/content/urlPreviews/OEmbedImagePreview.tsx
index bbb387426e3b8..9bc2b78b19012 100644
--- a/apps/meteor/client/components/message/content/urlPreviews/OEmbedImagePreview.tsx
+++ b/apps/meteor/client/components/message/content/urlPreviews/OEmbedImagePreview.tsx
@@ -1,10 +1,9 @@
 import { MessageGenericPreviewCoverImage } from '@rocket.chat/fuselage';
-import type { ReactElement } from 'react';
 
 import OEmbedCollapsible from './OEmbedCollapsible';
 import type { OEmbedPreviewMetadata } from './OEmbedPreviewMetadata';
 
-const OEmbedImagePreview = ({ image, ...props }: OEmbedPreviewMetadata): ReactElement => (
+const OEmbedImagePreview = ({ image, ...props }: OEmbedPreviewMetadata) => (
 	<OEmbedCollapsible {...props}>
 		{image?.url && <MessageGenericPreviewCoverImage height={192} width={368} url={image?.url} />}
 	</OEmbedCollapsible>
diff --git a/apps/meteor/client/components/message/content/urlPreviews/OEmbedLinkPreview.tsx b/apps/meteor/client/components/message/content/urlPreviews/OEmbedLinkPreview.tsx
index e0bbca0f043a7..1fd39c5dfe462 100644
--- a/apps/meteor/client/components/message/content/urlPreviews/OEmbedLinkPreview.tsx
+++ b/apps/meteor/client/components/message/content/urlPreviews/OEmbedLinkPreview.tsx
@@ -1,11 +1,10 @@
 import { MessageGenericPreviewCoverImage } from '@rocket.chat/fuselage';
 import { ExternalLink } from '@rocket.chat/ui-client';
-import type { ReactElement } from 'react';
 
 import OEmbedCollapsible from './OEmbedCollapsible';
 import type { OEmbedPreviewMetadata } from './OEmbedPreviewMetadata';
 
-const OEmbedLinkPreview = ({ image, url, ...props }: OEmbedPreviewMetadata): ReactElement => (
+const OEmbedLinkPreview = ({ image, url, ...props }: OEmbedPreviewMetadata) => (
 	<OEmbedCollapsible url={url} {...props}>
 		{image?.url && url && (
 			<ExternalLink to={url}>
diff --git a/apps/meteor/client/components/message/content/urlPreviews/OEmbedPreviewContent.tsx b/apps/meteor/client/components/message/content/urlPreviews/OEmbedPreviewContent.tsx
index 32f5b034e00e7..8dbde59060158 100644
--- a/apps/meteor/client/components/message/content/urlPreviews/OEmbedPreviewContent.tsx
+++ b/apps/meteor/client/components/message/content/urlPreviews/OEmbedPreviewContent.tsx
@@ -10,18 +10,9 @@ import type { ReactElement, ReactNode } from 'react';
 import type { OEmbedPreviewMetadata } from './OEmbedPreviewMetadata';
 import MarkdownText from '../../../MarkdownText';
 
-type OEmbedPreviewContentProps = { thumb?: ReactElement; children?: ReactNode } & OEmbedPreviewMetadata;
+type OEmbedPreviewContentProps = { thumb?: ReactElement<any>; children?: ReactNode } & OEmbedPreviewMetadata;
 
-const OEmbedPreviewContent = ({
-	title,
-	description,
-	url,
-	thumb,
-	authorName,
-	authorUrl,
-	siteName,
-	siteUrl,
-}: OEmbedPreviewContentProps): ReactElement => {
+const OEmbedPreviewContent = ({ title, description, url, thumb, authorName, authorUrl, siteName, siteUrl }: OEmbedPreviewContentProps) => {
 	const showSiteName = siteName && siteUrl;
 	const showAuthorName = authorName && authorUrl;
 	const showFooterSeparator = showSiteName && showAuthorName;
diff --git a/apps/meteor/client/components/message/content/urlPreviews/OEmbedResolver.tsx b/apps/meteor/client/components/message/content/urlPreviews/OEmbedResolver.tsx
index 3df79a44a8ad2..c2b473912c107 100644
--- a/apps/meteor/client/components/message/content/urlPreviews/OEmbedResolver.tsx
+++ b/apps/meteor/client/components/message/content/urlPreviews/OEmbedResolver.tsx
@@ -1,5 +1,3 @@
-import type { ReactElement } from 'react';
-
 import OEmbedHtmlPreview from './OEmbedHtmlPreview';
 import OEmbedImagePreview from './OEmbedImagePreview';
 import OEmbedLinkPreview from './OEmbedLinkPreview';
@@ -9,7 +7,7 @@ type OEmbedResolverProps = {
 	meta: OEmbedPreviewMetadata;
 };
 
-const OEmbedResolver = ({ meta }: OEmbedResolverProps): ReactElement | null => {
+const OEmbedResolver = ({ meta }: OEmbedResolverProps) => {
 	switch (meta.type) {
 		case 'rich':
 		case 'video':
diff --git a/apps/meteor/client/components/message/content/urlPreviews/UrlAudioPreview.tsx b/apps/meteor/client/components/message/content/urlPreviews/UrlAudioPreview.tsx
index da083e5a9aa3c..ce77ec9d90efc 100644
--- a/apps/meteor/client/components/message/content/urlPreviews/UrlAudioPreview.tsx
+++ b/apps/meteor/client/components/message/content/urlPreviews/UrlAudioPreview.tsx
@@ -1,10 +1,9 @@
 import { AudioPlayer } from '@rocket.chat/fuselage';
-import type { ReactElement } from 'react';
 
 import type { UrlPreviewMetadata } from './UrlPreviewMetadata';
 
 type UrlAudioPreviewProps = Pick<UrlPreviewMetadata, 'url'>;
 
-const UrlAudioPreview = ({ url }: UrlAudioPreviewProps): ReactElement => <AudioPlayer src={url} />;
+const UrlAudioPreview = ({ url }: UrlAudioPreviewProps) => <AudioPlayer src={url} />;
 
 export default UrlAudioPreview;
diff --git a/apps/meteor/client/components/message/content/urlPreviews/UrlImagePreview.tsx b/apps/meteor/client/components/message/content/urlPreviews/UrlImagePreview.tsx
index d9296fe6b161a..20932983a1799 100644
--- a/apps/meteor/client/components/message/content/urlPreviews/UrlImagePreview.tsx
+++ b/apps/meteor/client/components/message/content/urlPreviews/UrlImagePreview.tsx
@@ -1,10 +1,9 @@
 import { Box, MessageGenericPreviewImage } from '@rocket.chat/fuselage';
-import type { ReactElement } from 'react';
 
 import type { UrlPreviewMetadata } from './UrlPreviewMetadata';
 import { useOembedLayout } from '../../hooks/useOembedLayout';
 
-const UrlImagePreview = ({ url }: Pick<UrlPreviewMetadata, 'url'>): ReactElement => {
+const UrlImagePreview = ({ url }: Pick<UrlPreviewMetadata, 'url'>) => {
 	const { maxHeight: oembedMaxHeight } = useOembedLayout();
 
 	return (
diff --git a/apps/meteor/client/components/message/content/urlPreviews/UrlPreview.tsx b/apps/meteor/client/components/message/content/urlPreviews/UrlPreview.tsx
index 700dc47febc01..ef57acb12bba3 100644
--- a/apps/meteor/client/components/message/content/urlPreviews/UrlPreview.tsx
+++ b/apps/meteor/client/components/message/content/urlPreviews/UrlPreview.tsx
@@ -1,13 +1,12 @@
 import { Box } from '@rocket.chat/fuselage';
 import { useAttachmentAutoLoadEmbedMedia } from '@rocket.chat/ui-contexts';
-import type { ReactElement } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import type { UrlPreviewMetadata } from './UrlPreviewMetadata';
 import UrlPreviewResolver from './UrlPreviewResolver';
 import { useCollapse } from '../../hooks/useCollapse';
 
-const UrlPreview = (props: UrlPreviewMetadata): ReactElement => {
+const UrlPreview = (props: UrlPreviewMetadata) => {
 	const autoLoadMedia = useAttachmentAutoLoadEmbedMedia();
 	const [collapsed, collapse] = useCollapse(!autoLoadMedia);
 	const { t } = useTranslation();
diff --git a/apps/meteor/client/components/message/content/urlPreviews/UrlPreviewResolver.tsx b/apps/meteor/client/components/message/content/urlPreviews/UrlPreviewResolver.tsx
index d50961f5236e9..00f5a21351d6c 100644
--- a/apps/meteor/client/components/message/content/urlPreviews/UrlPreviewResolver.tsx
+++ b/apps/meteor/client/components/message/content/urlPreviews/UrlPreviewResolver.tsx
@@ -1,11 +1,9 @@
-import type { ReactElement } from 'react';
-
 import UrlAudioPreview from './UrlAudioPreview';
 import UrlImagePreview from './UrlImagePreview';
 import type { UrlPreviewMetadata } from './UrlPreviewMetadata';
 import UrlVideoPreview from './UrlVideoPreview';
 
-const UrlPreviewResolver = ({ url, type, originalType }: UrlPreviewMetadata): ReactElement | null => {
+const UrlPreviewResolver = ({ url, type, originalType }: UrlPreviewMetadata) => {
 	switch (type) {
 		case 'audio':
 			return <UrlAudioPreview url={url} />;
diff --git a/apps/meteor/client/components/message/content/urlPreviews/UrlVideoPreview.tsx b/apps/meteor/client/components/message/content/urlPreviews/UrlVideoPreview.tsx
index cab926b7b6643..c90ddc488ac00 100644
--- a/apps/meteor/client/components/message/content/urlPreviews/UrlVideoPreview.tsx
+++ b/apps/meteor/client/components/message/content/urlPreviews/UrlVideoPreview.tsx
@@ -1,12 +1,10 @@
-import type { ReactElement } from 'react';
-
 import type { UrlPreviewMetadata } from './UrlPreviewMetadata';
 
 const style = { maxWidth: '100%' };
-const UrlVideoPreview = ({ url, originalType }: Omit<UrlPreviewMetadata, 'type'>): ReactElement => (
+const UrlVideoPreview = ({ url, originalType }: Omit<UrlPreviewMetadata, 'type'>) => (
 	<video controls style={style}>
 		<source src={url} type={originalType} />
-		Your browser doesn't support the video element.
+		Your browser doesn&apos;t support the video element.
 		<track kind='captions' />
 	</video>
 );
diff --git a/apps/meteor/client/components/message/header/MessageRoles.tsx b/apps/meteor/client/components/message/header/MessageRoles.tsx
index a7d9ca6ca3c17..86540600e2f62 100644
--- a/apps/meteor/client/components/message/header/MessageRoles.tsx
+++ b/apps/meteor/client/components/message/header/MessageRoles.tsx
@@ -1,5 +1,4 @@
 import { MessageRole, MessageRoles as FuselageMessageRoles } from '@rocket.chat/fuselage';
-import type { ReactElement } from 'react';
 import { useTranslation } from 'react-i18next';
 
 type MessageRolesProps = {
@@ -7,7 +6,7 @@ type MessageRolesProps = {
 	isBot?: boolean;
 };
 
-const MessageRoles = ({ roles, isBot }: MessageRolesProps): ReactElement | null => {
+const MessageRoles = ({ roles, isBot }: MessageRolesProps) => {
 	const { t } = useTranslation();
 
 	return (
diff --git a/apps/meteor/client/components/message/notification/AllMentionNotification.tsx b/apps/meteor/client/components/message/notification/AllMentionNotification.tsx
index 3095539bdf659..a3caff5a30028 100644
--- a/apps/meteor/client/components/message/notification/AllMentionNotification.tsx
+++ b/apps/meteor/client/components/message/notification/AllMentionNotification.tsx
@@ -1,8 +1,6 @@
-import type { ReactElement } from 'react';
-
 import MessageNotification from './MessageNotification';
 
-const AllMentionNotification = function All(): ReactElement {
+const AllMentionNotification = function All() {
 	return <MessageNotification label='mention-all' bg='badge-background-level-3' />;
 };
 
diff --git a/apps/meteor/client/components/message/notification/MessageNotification.tsx b/apps/meteor/client/components/message/notification/MessageNotification.tsx
index f5d1b41139753..1ad7d78c028df 100644
--- a/apps/meteor/client/components/message/notification/MessageNotification.tsx
+++ b/apps/meteor/client/components/message/notification/MessageNotification.tsx
@@ -1,7 +1,6 @@
 import type { Palette } from '@rocket.chat/fuselage';
 import { Box } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import type { ReactElement } from 'react';
 import { useTranslation } from 'react-i18next';
 
 type MessageNotificationProps = {
@@ -9,7 +8,7 @@ type MessageNotificationProps = {
 	bg: keyof (typeof Palette)['badge'];
 };
 
-const MessageNotification = ({ label, bg }: MessageNotificationProps): ReactElement => {
+const MessageNotification = ({ label, bg }: MessageNotificationProps) => {
 	const { t } = useTranslation();
 	return <Box width='x8' aria-label={t(label)} borderRadius='full' height='x8' bg={bg} />;
 };
diff --git a/apps/meteor/client/components/message/notification/UnreadMessagesNotification.tsx b/apps/meteor/client/components/message/notification/UnreadMessagesNotification.tsx
index eebac02306790..d2212a1fe0a68 100644
--- a/apps/meteor/client/components/message/notification/UnreadMessagesNotification.tsx
+++ b/apps/meteor/client/components/message/notification/UnreadMessagesNotification.tsx
@@ -1,8 +1,6 @@
-import type { ReactElement } from 'react';
-
 import MessageNotification from './MessageNotification';
 
-const UnreadMessagesNotification = (): ReactElement => {
+const UnreadMessagesNotification = () => {
 	return <MessageNotification label='Unread' bg='badge-background-level-2' />;
 };
 
diff --git a/apps/meteor/client/components/message/toolbar/MessageToolbar.tsx b/apps/meteor/client/components/message/toolbar/MessageToolbar.tsx
index f8112220b792f..9e52439e6f976 100644
--- a/apps/meteor/client/components/message/toolbar/MessageToolbar.tsx
+++ b/apps/meteor/client/components/message/toolbar/MessageToolbar.tsx
@@ -3,7 +3,7 @@ import type { IMessage, IRoom, ISubscription, ITranslatedMessage } from '@rocket
 import { isThreadMessage, isRoomFederated, isVideoConfMessage } from '@rocket.chat/core-typings';
 import { MessageToolbar as FuselageMessageToolbar } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import type { ComponentProps, ElementType, ReactElement } from 'react';
+import type { ComponentProps, ElementType } from 'react';
 import { memo, useRef } from 'react';
 
 import MessageToolbarActionMenu from './MessageToolbarActionMenu';
@@ -66,14 +66,7 @@ type MessageToolbarProps = {
 	onChangeMenuVisibility: (visible: boolean) => void;
 } & ComponentProps<typeof FuselageMessageToolbar>;
 
-const MessageToolbar = ({
-	message,
-	messageContext,
-	room,
-	subscription,
-	onChangeMenuVisibility,
-	...props
-}: MessageToolbarProps): ReactElement | null => {
+const MessageToolbar = ({ message, messageContext, room, subscription, onChangeMenuVisibility, ...props }: MessageToolbarProps) => {
 	const t = useTranslation();
 
 	const toolbarRef = useRef(null);
diff --git a/apps/meteor/client/components/message/toolbar/items/actions/Timestamp/TimestampPicker/DatePicker.tsx b/apps/meteor/client/components/message/toolbar/items/actions/Timestamp/TimestampPicker/DatePicker.tsx
index 4b4fd1d83a035..e46bd2f3d50e4 100644
--- a/apps/meteor/client/components/message/toolbar/items/actions/Timestamp/TimestampPicker/DatePicker.tsx
+++ b/apps/meteor/client/components/message/toolbar/items/actions/Timestamp/TimestampPicker/DatePicker.tsx
@@ -1,6 +1,6 @@
 import { Box, Field, FieldLabel, FieldRow, InputBox } from '@rocket.chat/fuselage';
 import { format } from 'date-fns';
-import type { ChangeEvent, ReactElement } from 'react';
+import type { ChangeEvent } from 'react';
 import { useId } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -9,7 +9,7 @@ type DatePickerProps = {
 	onChange: (date: Date) => void;
 };
 
-const DatePicker = ({ value, onChange }: DatePickerProps): ReactElement => {
+const DatePicker = ({ value, onChange }: DatePickerProps) => {
 	const { t } = useTranslation();
 	const fieldId = useId();
 
diff --git a/apps/meteor/client/components/message/toolbar/items/actions/Timestamp/TimestampPicker/FormatSelector.tsx b/apps/meteor/client/components/message/toolbar/items/actions/Timestamp/TimestampPicker/FormatSelector.tsx
index f6d20be04c855..5ddabe5b0f3be 100644
--- a/apps/meteor/client/components/message/toolbar/items/actions/Timestamp/TimestampPicker/FormatSelector.tsx
+++ b/apps/meteor/client/components/message/toolbar/items/actions/Timestamp/TimestampPicker/FormatSelector.tsx
@@ -1,5 +1,5 @@
 import { Box, Field, FieldLabel, FieldRow, Select } from '@rocket.chat/fuselage';
-import type { ReactElement, Key } from 'react';
+import type { Key } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { TIMESTAMP_FORMATS } from '../../../../../../../lib/utils/timestamp/formats';
@@ -10,7 +10,7 @@ type FormatSelectorProps = {
 	onChange: (format: TimestampFormat) => void;
 };
 
-const FormatSelector = ({ value, onChange }: FormatSelectorProps): ReactElement => {
+const FormatSelector = ({ value, onChange }: FormatSelectorProps) => {
 	const { t } = useTranslation();
 
 	const handleFormatChange = (key: Key): void => {
diff --git a/apps/meteor/client/components/message/toolbar/items/actions/Timestamp/TimestampPicker/Preview.tsx b/apps/meteor/client/components/message/toolbar/items/actions/Timestamp/TimestampPicker/Preview.tsx
index 59232121d2f15..091be3e840f81 100644
--- a/apps/meteor/client/components/message/toolbar/items/actions/Timestamp/TimestampPicker/Preview.tsx
+++ b/apps/meteor/client/components/message/toolbar/items/actions/Timestamp/TimestampPicker/Preview.tsx
@@ -1,7 +1,6 @@
 import { Box, Field, FieldLabel, FieldRow } from '@rocket.chat/fuselage';
 import { Markup } from '@rocket.chat/gazzodown';
 import { parse } from '@rocket.chat/message-parser';
-import type { ReactElement } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { dateToISOString, generateTimestampMarkup } from '../../../../../../../lib/utils/timestamp/conversion';
@@ -14,7 +13,7 @@ type PreviewProps = {
 	timezone: TimezoneKey;
 };
 
-const Preview = ({ date, format, timezone }: PreviewProps): ReactElement => {
+const Preview = ({ date, format, timezone }: PreviewProps) => {
 	const { t } = useTranslation();
 	const timestamp = dateToISOString(date, timezone);
 	const markup = generateTimestampMarkup(timestamp, format);
diff --git a/apps/meteor/client/components/message/toolbar/items/actions/Timestamp/TimestampPicker/TimePicker.tsx b/apps/meteor/client/components/message/toolbar/items/actions/Timestamp/TimestampPicker/TimePicker.tsx
index 0560b3c56b8ec..a0d0e6850b9dc 100644
--- a/apps/meteor/client/components/message/toolbar/items/actions/Timestamp/TimestampPicker/TimePicker.tsx
+++ b/apps/meteor/client/components/message/toolbar/items/actions/Timestamp/TimestampPicker/TimePicker.tsx
@@ -1,6 +1,6 @@
 import { Box, Field, FieldLabel, FieldRow, InputBox } from '@rocket.chat/fuselage';
 import { format } from 'date-fns';
-import type { ChangeEvent, ReactElement } from 'react';
+import type { ChangeEvent } from 'react';
 import { useId } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -9,7 +9,7 @@ type TimePickerProps = {
 	onChange: (date: Date) => void;
 };
 
-const TimePicker = ({ value, onChange }: TimePickerProps): ReactElement => {
+const TimePicker = ({ value, onChange }: TimePickerProps) => {
 	const { t } = useTranslation();
 	const fieldId = useId();
 
diff --git a/apps/meteor/client/components/message/toolbar/items/actions/Timestamp/TimestampPicker/TimezoneSelector.tsx b/apps/meteor/client/components/message/toolbar/items/actions/Timestamp/TimestampPicker/TimezoneSelector.tsx
index 8a8c07b54d624..ba7e8b04265bb 100644
--- a/apps/meteor/client/components/message/toolbar/items/actions/Timestamp/TimestampPicker/TimezoneSelector.tsx
+++ b/apps/meteor/client/components/message/toolbar/items/actions/Timestamp/TimestampPicker/TimezoneSelector.tsx
@@ -1,5 +1,5 @@
 import { Box, Field, FieldHint, FieldDescription, FieldLabel, FieldRow, Select } from '@rocket.chat/fuselage';
-import type { ReactElement, Key } from 'react';
+import type { Key } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { UTCOffsets } from '../../../../../../../lib/utils/timestamp/types';
@@ -10,7 +10,7 @@ type TimezoneSelectorProps = {
 	onChange: (timezone: TimezoneKey) => void;
 };
 
-const TimezoneSelector = ({ value, onChange }: TimezoneSelectorProps): ReactElement => {
+const TimezoneSelector = ({ value, onChange }: TimezoneSelectorProps) => {
 	const { t } = useTranslation();
 
 	const handleTimezoneChange = (key: Key): void => {
diff --git a/apps/meteor/client/components/message/variants/RoomMessage.tsx b/apps/meteor/client/components/message/variants/RoomMessage.tsx
index 01a8eea26916d..157856ce3b087 100644
--- a/apps/meteor/client/components/message/variants/RoomMessage.tsx
+++ b/apps/meteor/client/components/message/variants/RoomMessage.tsx
@@ -3,7 +3,7 @@ import { Message, MessageLeftContainer, MessageContainer, CheckBox } from '@rock
 import { useToggle } from '@rocket.chat/fuselage-hooks';
 import { MessageAvatar } from '@rocket.chat/ui-avatar';
 import { useUserId, useUserCard } from '@rocket.chat/ui-contexts';
-import type { ComponentProps, ReactElement } from 'react';
+import type { ComponentProps } from 'react';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -71,7 +71,7 @@ const RoomMessage = ({
 	ignoredUser,
 	searchText,
 	...props
-}: RoomMessageProps): ReactElement => {
+}: RoomMessageProps) => {
 	const { t } = useTranslation();
 	const uid = useUserId();
 	const editing = useIsMessageHighlight(message._id);
diff --git a/apps/meteor/client/components/message/variants/SystemMessage.tsx b/apps/meteor/client/components/message/variants/SystemMessage.tsx
index 56712220f42e1..1ca0d4f8b2925 100644
--- a/apps/meteor/client/components/message/variants/SystemMessage.tsx
+++ b/apps/meteor/client/components/message/variants/SystemMessage.tsx
@@ -17,7 +17,7 @@ import { UserAvatar } from '@rocket.chat/ui-avatar';
 import { useUserDisplayName } from '@rocket.chat/ui-client';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import { useUserPresence, useUserCard } from '@rocket.chat/ui-contexts';
-import type { ComponentProps, ReactElement } from 'react';
+import type { ComponentProps } from 'react';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -43,7 +43,7 @@ type SystemMessageProps = {
 	showUserAvatar: boolean;
 } & ComponentProps<typeof MessageSystem>;
 
-const SystemMessage = ({ message, showUserAvatar, ...props }: SystemMessageProps): ReactElement => {
+const SystemMessage = ({ message, showUserAvatar, ...props }: SystemMessageProps) => {
 	const { t } = useTranslation();
 	const formatTime = useMessageListFormatTime();
 	const formatDateAndTime = useMessageListFormatDateAndTime();
diff --git a/apps/meteor/client/components/message/variants/ThreadMessage.tsx b/apps/meteor/client/components/message/variants/ThreadMessage.tsx
index a2a7da39488d7..3da6be5296e79 100644
--- a/apps/meteor/client/components/message/variants/ThreadMessage.tsx
+++ b/apps/meteor/client/components/message/variants/ThreadMessage.tsx
@@ -3,7 +3,6 @@ import { Message, MessageLeftContainer, MessageContainer } from '@rocket.chat/fu
 import { useToggle } from '@rocket.chat/fuselage-hooks';
 import { MessageAvatar } from '@rocket.chat/ui-avatar';
 import { useTranslation, useUserId, useUserCard } from '@rocket.chat/ui-contexts';
-import type { ReactElement } from 'react';
 import { memo } from 'react';
 
 import type { MessageActionContext } from '../../../../app/ui-utils/client/lib/MessageAction';
@@ -22,7 +21,7 @@ type ThreadMessageProps = {
 	showUserAvatar: boolean;
 };
 
-const ThreadMessage = ({ message, sequential, unread, showUserAvatar }: ThreadMessageProps): ReactElement => {
+const ThreadMessage = ({ message, sequential, unread, showUserAvatar }: ThreadMessageProps) => {
 	const t = useTranslation();
 	const uid = useUserId();
 	const editing = useIsMessageHighlight(message._id);
diff --git a/apps/meteor/client/components/message/variants/ThreadMessagePreview.tsx b/apps/meteor/client/components/message/variants/ThreadMessagePreview.tsx
index dba6f675858f7..0717136da1f8e 100644
--- a/apps/meteor/client/components/message/variants/ThreadMessagePreview.tsx
+++ b/apps/meteor/client/components/message/variants/ThreadMessagePreview.tsx
@@ -14,7 +14,7 @@ import {
 } from '@rocket.chat/fuselage';
 import { MessageTypes } from '@rocket.chat/message-types';
 import { MessageAvatar } from '@rocket.chat/ui-avatar';
-import type { ComponentProps, ReactElement } from 'react';
+import type { ComponentProps } from 'react';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -39,7 +39,7 @@ type ThreadMessagePreviewProps = {
 	sequential: boolean;
 } & ComponentProps<typeof ThreadMessage>;
 
-const ThreadMessagePreview = ({ message, showUserAvatar, sequential, ...props }: ThreadMessagePreviewProps): ReactElement => {
+const ThreadMessagePreview = ({ message, showUserAvatar, sequential, ...props }: ThreadMessagePreviewProps) => {
 	const parentMessage = useParentMessage(message.tmid);
 
 	const translated = useShowTranslated(message);
diff --git a/apps/meteor/client/components/message/variants/room/RoomMessageContent.tsx b/apps/meteor/client/components/message/variants/room/RoomMessageContent.tsx
index 813d63e9f9130..1816414cd4bf1 100644
--- a/apps/meteor/client/components/message/variants/room/RoomMessageContent.tsx
+++ b/apps/meteor/client/components/message/variants/room/RoomMessageContent.tsx
@@ -3,7 +3,6 @@ import { isDiscussionMessage, isThreadMainMessage, isE2EEMessage, isQuoteAttachm
 import { MessageBody } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import { useUserId, useUserPresence } from '@rocket.chat/ui-contexts';
-import type { ReactElement } from 'react';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -32,7 +31,7 @@ type RoomMessageContentProps = {
 	searchText?: string;
 };
 
-const RoomMessageContent = ({ message, unread, all, mention, searchText }: RoomMessageContentProps): ReactElement => {
+const RoomMessageContent = ({ message, unread, all, mention, searchText }: RoomMessageContentProps) => {
 	const encrypted = isE2EEMessage(message);
 	const { enabled: oembedEnabled } = useOembedLayout();
 	const subscription = useSubscriptionFromMessageQuery(message).data ?? undefined;
diff --git a/apps/meteor/client/components/message/variants/thread/ThreadMessageContent.tsx b/apps/meteor/client/components/message/variants/thread/ThreadMessageContent.tsx
index d137162d0b06d..b60c0f2433642 100644
--- a/apps/meteor/client/components/message/variants/thread/ThreadMessageContent.tsx
+++ b/apps/meteor/client/components/message/variants/thread/ThreadMessageContent.tsx
@@ -3,7 +3,6 @@ import { isE2EEMessage, isQuoteAttachment } from '@rocket.chat/core-typings';
 import { MessageBody } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import { useUserId, useUserPresence } from '@rocket.chat/ui-contexts';
-import type { ReactElement } from 'react';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -25,7 +24,7 @@ type ThreadMessageContentProps = {
 	message: IThreadMessage | IThreadMainMessage;
 };
 
-const ThreadMessageContent = ({ message }: ThreadMessageContentProps): ReactElement => {
+const ThreadMessageContent = ({ message }: ThreadMessageContentProps) => {
 	const encrypted = isE2EEMessage(message);
 	const { enabled: oembedEnabled } = useOembedLayout();
 	const subscription = useSubscriptionFromMessageQuery(message).data ?? undefined;
diff --git a/apps/meteor/client/components/message/variants/threadPreview/ThreadMessagePreviewBody.tsx b/apps/meteor/client/components/message/variants/threadPreview/ThreadMessagePreviewBody.tsx
index 72c4b8cb460dd..37112d7294df5 100644
--- a/apps/meteor/client/components/message/variants/threadPreview/ThreadMessagePreviewBody.tsx
+++ b/apps/meteor/client/components/message/variants/threadPreview/ThreadMessagePreviewBody.tsx
@@ -2,7 +2,6 @@ import type { IMessage } from '@rocket.chat/core-typings';
 import { isQuoteAttachment, isE2EEMessage } from '@rocket.chat/core-typings';
 import { PreviewMarkup } from '@rocket.chat/gazzodown';
 import type { Root } from '@rocket.chat/message-parser';
-import type { ReactElement } from 'react';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -12,7 +11,7 @@ type ThreadMessagePreviewBodyProps = {
 	message: IMessage;
 };
 
-const ThreadMessagePreviewBody = ({ message }: ThreadMessagePreviewBodyProps): ReactElement => {
+const ThreadMessagePreviewBody = ({ message }: ThreadMessagePreviewBodyProps) => {
 	const { t } = useTranslation();
 	const isEncryptedMessage = isE2EEMessage(message);