diff --git a/apps/meteor/client/apps/gameCenter/GameCenter.tsx b/apps/meteor/client/apps/gameCenter/GameCenter.tsx
index 058cc7dfdcd49..0955710c0a936 100644
--- a/apps/meteor/client/apps/gameCenter/GameCenter.tsx
+++ b/apps/meteor/client/apps/gameCenter/GameCenter.tsx
@@ -2,7 +2,7 @@ import type { IExternalComponent } from '@rocket.chat/apps-engine/definition/ext
 import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
 import { useRoomToolbox } from '@rocket.chat/ui-contexts';
 import { useState } from 'react';
-import type { MouseEvent, ReactElement } from 'react';
+import type { MouseEvent } from 'react';
 
 import GameCenterContainer from './GameCenterContainer';
 import GameCenterList from './GameCenterList';
@@ -11,7 +11,7 @@ import { preventSyntheticEvent } from '../../lib/utils/preventSyntheticEvent';
 
 export type IGame = IExternalComponent;
 
-const GameCenter = (): ReactElement => {
+const GameCenter = () => {
 	const [openedGame, setOpenedGame] = useState<IGame>();
 
 	const { closeTab } = useRoomToolbox();
diff --git a/apps/meteor/client/apps/gameCenter/GameCenterContainer.tsx b/apps/meteor/client/apps/gameCenter/GameCenterContainer.tsx
index a275e98107a92..c6b9b95ffe120 100644
--- a/apps/meteor/client/apps/gameCenter/GameCenterContainer.tsx
+++ b/apps/meteor/client/apps/gameCenter/GameCenterContainer.tsx
@@ -7,7 +7,6 @@ import {
 	ContextualbarClose,
 	ContextualbarDialog,
 } from '@rocket.chat/ui-client';
-import type { ReactElement } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import type { IGame } from './GameCenter';
@@ -18,7 +17,7 @@ interface IGameCenterContainerProps {
 	game: IGame;
 }
 
-const GameCenterContainer = ({ handleClose, handleBack, game }: IGameCenterContainerProps): ReactElement => {
+const GameCenterContainer = ({ handleClose, handleBack, game }: IGameCenterContainerProps) => {
 	const { t } = useTranslation();
 
 	return (
diff --git a/apps/meteor/client/apps/gameCenter/GameCenterInvitePlayersModal.tsx b/apps/meteor/client/apps/gameCenter/GameCenterInvitePlayersModal.tsx
index e447038f70ae7..bad66d4d3f2df 100644
--- a/apps/meteor/client/apps/gameCenter/GameCenterInvitePlayersModal.tsx
+++ b/apps/meteor/client/apps/gameCenter/GameCenterInvitePlayersModal.tsx
@@ -2,7 +2,6 @@ import type { IUser } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
 import { Random } from '@rocket.chat/random';
 import { GenericModal } from '@rocket.chat/ui-client';
-import type { ReactElement } from 'react';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -20,7 +19,7 @@ interface IGameCenterInvitePlayersModalProps {
 	onClose: () => void;
 }
 
-const GameCenterInvitePlayersModal = ({ game, onClose }: IGameCenterInvitePlayersModalProps): ReactElement => {
+const GameCenterInvitePlayersModal = ({ game, onClose }: IGameCenterInvitePlayersModalProps) => {
 	const { t } = useTranslation();
 	const [users, setUsers] = useState<Array<Username>>([]);
 	const { name } = game;
diff --git a/apps/meteor/client/apps/gameCenter/GameCenterList.tsx b/apps/meteor/client/apps/gameCenter/GameCenterList.tsx
index 539a4f20b4a92..4a9f179a317b8 100644
--- a/apps/meteor/client/apps/gameCenter/GameCenterList.tsx
+++ b/apps/meteor/client/apps/gameCenter/GameCenterList.tsx
@@ -8,7 +8,6 @@ import {
 	ContextualbarSkeleton,
 } from '@rocket.chat/ui-client';
 import { useSetModal } from '@rocket.chat/ui-contexts';
-import type { ReactElement } from 'react';
 import { memo, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -22,7 +21,7 @@ interface IGameCenterListProps {
 	isLoading: boolean;
 }
 
-const GameCenterList = ({ handleClose, handleOpenGame, games, isLoading }: IGameCenterListProps): ReactElement => {
+const GameCenterList = ({ handleClose, handleOpenGame, games, isLoading }: IGameCenterListProps) => {
 	const { t } = useTranslation();
 	const setModal = useSetModal();
 
diff --git a/apps/meteor/client/providers/ActionManagerProvider.tsx b/apps/meteor/client/providers/ActionManagerProvider.tsx
index 6698b5cfef651..088ee92aee91a 100644
--- a/apps/meteor/client/providers/ActionManagerProvider.tsx
+++ b/apps/meteor/client/providers/ActionManagerProvider.tsx
@@ -1,5 +1,5 @@
 import { ActionManagerContext, useRouter } from '@rocket.chat/ui-contexts';
-import type { ReactNode, ReactElement } from 'react';
+import type { ReactNode } from 'react';
 
 import { ActionManager } from '../../app/ui-message/client/ActionManager';
 import { useAppActionButtons } from '../hooks/useAppActionButtons';
@@ -12,7 +12,7 @@ type ActionManagerProviderProps = {
 	children?: ReactNode;
 };
 
-const ActionManagerProvider = ({ children }: ActionManagerProviderProps): ReactElement => {
+const ActionManagerProvider = ({ children }: ActionManagerProviderProps) => {
 	const router = useRouter();
 	const actionManager = useInstance(() => [new ActionManager(router)], [router]);
 	useTranslationsForApps();
diff --git a/apps/meteor/client/providers/AuthenticationProvider/AuthenticationProvider.tsx b/apps/meteor/client/providers/AuthenticationProvider/AuthenticationProvider.tsx
index 3e3f4e9eed532..fb1356450ab80 100644
--- a/apps/meteor/client/providers/AuthenticationProvider/AuthenticationProvider.tsx
+++ b/apps/meteor/client/providers/AuthenticationProvider/AuthenticationProvider.tsx
@@ -3,7 +3,7 @@ import { capitalize } from '@rocket.chat/string-helpers';
 import { AuthenticationContext, useSetting } from '@rocket.chat/ui-contexts';
 import { Accounts } from 'meteor/accounts-base';
 import { Meteor } from 'meteor/meteor';
-import type { ContextType, ReactElement, ReactNode } from 'react';
+import type { ContextType, ReactNode } from 'react';
 import { useMemo, useSyncExternalStore } from 'react';
 
 import { useLDAPAndCrowdCollisionWarning } from './hooks/useLDAPAndCrowdCollisionWarning';
@@ -57,7 +57,7 @@ const subscribeLoggingIn = (cb: () => void): (() => void) => {
 
 const getLoggingInSnapshot = (): boolean => Accounts.loggingIn();
 
-const AuthenticationProvider = ({ children }: AuthenticationProviderProps): ReactElement => {
+const AuthenticationProvider = ({ children }: AuthenticationProviderProps) => {
 	const isLdapEnabled = useSetting('LDAP_Enable', false);
 	const isCrowdEnabled = useSetting('CROWD_Enable', false);
 
diff --git a/apps/meteor/client/providers/DeviceProvider/DeviceProvider.tsx b/apps/meteor/client/providers/DeviceProvider/DeviceProvider.tsx
index dc264c12a365d..686931813ce61 100644
--- a/apps/meteor/client/providers/DeviceProvider/DeviceProvider.tsx
+++ b/apps/meteor/client/providers/DeviceProvider/DeviceProvider.tsx
@@ -2,7 +2,7 @@ import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
 import type { Device, DeviceContextValue } from '@rocket.chat/ui-contexts';
 import { DeviceContext } from '@rocket.chat/ui-contexts';
 import { useQuery, useQueryClient, keepPreviousData } from '@tanstack/react-query';
-import type { ReactElement, ReactNode } from 'react';
+import type { ReactNode } from 'react';
 import { useEffect, useState, useMemo } from 'react';
 
 import { isSetSinkIdAvailable } from './lib/isSetSinkIdAvailable';
@@ -28,7 +28,7 @@ const defaultDevices = {
 
 const devicesQueryKey = ['media-devices-list'];
 
-export const DeviceProvider = ({ children }: DeviceProviderProps): ReactElement => {
+export const DeviceProvider = ({ children }: DeviceProviderProps) => {
 	const [enabled] = useState(typeof isSecureContext && isSecureContext);
 	const [selectedAudioOutputDevice, setSelectedAudioOutputDevice] = useState<Device | undefined>(undefined);
 	const [selectedAudioInputDevice, setSelectedAudioInputDevice] = useState<Device | undefined>(undefined);
diff --git a/apps/meteor/client/providers/EmojiPickerProvider/EmojiPickerProvider.tsx b/apps/meteor/client/providers/EmojiPickerProvider/EmojiPickerProvider.tsx
index 0fcb5ae6e1a4e..1de2c278d65b0 100644
--- a/apps/meteor/client/providers/EmojiPickerProvider/EmojiPickerProvider.tsx
+++ b/apps/meteor/client/providers/EmojiPickerProvider/EmojiPickerProvider.tsx
@@ -1,5 +1,5 @@
 import { useDebouncedState, useEffectEvent, useLocalStorage } from '@rocket.chat/fuselage-hooks';
-import type { ReactNode, ReactElement, ContextType } from 'react';
+import type { ReactNode, ContextType } from 'react';
 import { useState, useCallback, useMemo, useSyncExternalStore } from 'react';
 
 import { useUpdateCustomEmoji } from './useUpdateCustomEmoji';
@@ -12,8 +12,8 @@ const DEFAULT_ITEMS_LIMIT = 90;
 // limit recent emojis to 27 (3 rows of 9)
 const RECENT_EMOJIS_LIMIT = 27;
 
-const EmojiPickerProvider = ({ children }: { children: ReactNode }): ReactElement => {
-	const [emojiPicker, setEmojiPicker] = useState<ReactElement | null>(null);
+const EmojiPickerProvider = ({ children }: { children: ReactNode }) => {
+	const [emojiPicker, setEmojiPicker] = useState<ReactNode>(null);
 	const [emojiToPreview, setEmojiToPreview] = useDebouncedState<{ emoji: string; name: string } | null>(null, 100);
 	const [recentEmojis, setRecentEmojis] = useLocalStorage<string[]>('emoji.recent', []);
 	const [frequentEmojis, setFrequentEmojis] = useLocalStorage<[string, number][]>('emoji.frequent', []);
diff --git a/apps/meteor/client/providers/TranslationProvider.tsx b/apps/meteor/client/providers/TranslationProvider.tsx
index d9373c79630f0..86c82fb956dbd 100644
--- a/apps/meteor/client/providers/TranslationProvider.tsx
+++ b/apps/meteor/client/providers/TranslationProvider.tsx
@@ -15,7 +15,7 @@ import type { TranslationContextValue } from '@rocket.chat/ui-contexts';
 import { useSetting, TranslationContext } from '@rocket.chat/ui-contexts';
 import type i18next from 'i18next';
 import I18NextHttpBackend from 'i18next-http-backend';
-import type { ReactElement, ReactNode } from 'react';
+import type { ReactNode } from 'react';
 import { useEffect, useMemo } from 'react';
 import { I18nextProvider, initReactI18next, useTranslation } from 'react-i18next';
 
@@ -188,7 +188,7 @@ type TranslationProviderProps = {
 	children: ReactNode;
 };
 
-const TranslationProvider = ({ children }: TranslationProviderProps): ReactElement => {
+const TranslationProvider = ({ children }: TranslationProviderProps) => {
 	const language = useAutoLanguage();
 	const i18nextInstance = useI18next(language);
 	useCustomTranslations(i18nextInstance);
@@ -252,7 +252,7 @@ const TranslationProviderInner = ({
 		ogName: string;
 		key: string;
 	}[];
-}): ReactElement => {
+}) => {
 	const { t, i18n } = useTranslation();
 
 	const value: TranslationContextValue = useMemo(
diff --git a/apps/meteor/client/providers/UserProvider/UserProvider.tsx b/apps/meteor/client/providers/UserProvider/UserProvider.tsx
index c1e8b84aff014..5ef3566201b02 100644
--- a/apps/meteor/client/providers/UserProvider/UserProvider.tsx
+++ b/apps/meteor/client/providers/UserProvider/UserProvider.tsx
@@ -7,7 +7,7 @@ import { UserContext, useRouteParameter, useSearchParameter } from '@rocket.chat
 import { useQueryClient } from '@tanstack/react-query';
 import { Meteor } from 'meteor/meteor';
 import type { Filter, ObjectId } from 'mongodb';
-import type { ContextType, ReactElement, ReactNode } from 'react';
+import type { ContextType, ReactNode } from 'react';
 import { useEffect, useMemo, useRef } from 'react';
 import type { StoreApi, UseBoundStore } from 'zustand';
 
@@ -61,7 +61,7 @@ const queryRoom = (
 	return [subscribe, getSnapshot];
 };
 
-const UserProvider = ({ children }: UserProviderProps): ReactElement => {
+const UserProvider = ({ children }: UserProviderProps) => {
 	const userId = userIdStore();
 
 	const user = Users.use((state) => {
diff --git a/apps/meteor/client/providers/UserProvider/hooks/useReloadAfterLogin.ts b/apps/meteor/client/providers/UserProvider/hooks/useReloadAfterLogin.ts
index eaf357577bdb4..8008fccc065f3 100644
--- a/apps/meteor/client/providers/UserProvider/hooks/useReloadAfterLogin.ts
+++ b/apps/meteor/client/providers/UserProvider/hooks/useReloadAfterLogin.ts
@@ -6,7 +6,7 @@ import { LegacyRoomManager } from '../../../../app/ui-utils/client';
 import { roomCoordinator } from '../../../lib/rooms/roomCoordinator';
 
 export const useReloadAfterLogin = (user: IUser | null) => {
-	const usernameRef = useRef<string>();
+	const usernameRef = useRef<string>(undefined);
 	const router = useRouter();
 
 	useEffect(() => {
diff --git a/apps/meteor/client/providers/VideoConfProvider.tsx b/apps/meteor/client/providers/VideoConfProvider.tsx
index 407a48cac2134..2bd2bcdb15f7a 100644
--- a/apps/meteor/client/providers/VideoConfProvider.tsx
+++ b/apps/meteor/client/providers/VideoConfProvider.tsx
@@ -1,7 +1,7 @@
 import { useToastMessageDispatch, useSetting } from '@rocket.chat/ui-contexts';
 import type { VideoConfPopupPayload, VideoConfContextValue } from '@rocket.chat/ui-video-conf';
 import { VideoConfContext } from '@rocket.chat/ui-video-conf';
-import type { ReactElement, ReactNode } from 'react';
+import type { ReactNode } from 'react';
 import { useState, useMemo, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -9,7 +9,7 @@ import { VideoConfManager } from '../lib/VideoConfManager';
 import VideoConfPopups from '../views/room/contextualBar/VideoConference/VideoConfPopups';
 import { useVideoConfOpenCall } from '../views/room/contextualBar/VideoConference/hooks/useVideoConfOpenCall';
 
-const VideoConfContextProvider = ({ children }: { children: ReactNode }): ReactElement => {
+const VideoConfContextProvider = ({ children }: { children: ReactNode }) => {
 	const [outgoing, setOutgoing] = useState<VideoConfPopupPayload | undefined>();
 	const handleOpenCall = useVideoConfOpenCall();
 	const dispatchToastMessage = useToastMessageDispatch();
diff --git a/apps/meteor/client/stories/contexts/ModalContextMock.tsx b/apps/meteor/client/stories/contexts/ModalContextMock.tsx
index ee8074ddd64c5..af58a5c5738b6 100644
--- a/apps/meteor/client/stories/contexts/ModalContextMock.tsx
+++ b/apps/meteor/client/stories/contexts/ModalContextMock.tsx
@@ -1,6 +1,6 @@
 import { ModalContext } from '@rocket.chat/ui-contexts';
 import { action } from '@storybook/addon-actions';
-import type { ContextType, ReactElement, ReactNode } from 'react';
+import type { ContextType, ReactNode } from 'react';
 import { useContext, useMemo } from 'react';
 
 const logAction = action('ModalContext');
@@ -9,7 +9,7 @@ type ModalContextMockProps = {
 	children: ReactNode;
 };
 
-const ModalContextMock = ({ children }: ModalContextMockProps): ReactElement => {
+const ModalContextMock = ({ children }: ModalContextMockProps) => {
 	const context = useContext(ModalContext);
 
 	const value = useMemo(
diff --git a/apps/meteor/client/stories/contexts/RouterContextMock.tsx b/apps/meteor/client/stories/contexts/RouterContextMock.tsx
index 793baab27641b..fd986b392e51e 100644
--- a/apps/meteor/client/stories/contexts/RouterContextMock.tsx
+++ b/apps/meteor/client/stories/contexts/RouterContextMock.tsx
@@ -1,6 +1,6 @@
 import { RouterContext } from '@rocket.chat/ui-contexts';
 import { action } from '@storybook/addon-actions';
-import type { ContextType, ReactElement, ReactNode } from 'react';
+import type { ContextType, ReactNode } from 'react';
 import { useContext, useMemo } from 'react';
 
 const logAction = action('RouterContext');
@@ -15,7 +15,7 @@ window.__meteor_runtime_config__ = {
 	ROOT_URL_PATH_PREFIX: '',
 };
 
-const RouterContextMock = ({ children }: RouterContextMockProps): ReactElement => {
+const RouterContextMock = ({ children }: RouterContextMockProps) => {
 	const parent = useContext(RouterContext);
 
 	const value = useMemo(
diff --git a/apps/meteor/client/stories/contexts/ServerContextMock.tsx b/apps/meteor/client/stories/contexts/ServerContextMock.tsx
index d48bc3e0130ad..9602a21abe9d5 100644
--- a/apps/meteor/client/stories/contexts/ServerContextMock.tsx
+++ b/apps/meteor/client/stories/contexts/ServerContextMock.tsx
@@ -4,7 +4,7 @@ import type { Method, OperationParams, OperationResult, PathFor, PathPattern } f
 import type { UploadResult } from '@rocket.chat/ui-contexts';
 import { ServerContext } from '@rocket.chat/ui-contexts';
 import { action } from '@storybook/addon-actions';
-import type { ContextType, ReactElement, ReactNode } from 'react';
+import type { ContextType, ReactNode } from 'react';
 import { useContext, useMemo } from 'react';
 
 const logAction = action('ServerContext');
@@ -66,13 +66,7 @@ type ServerContextMockProps = Omit<Partial<ContextType<typeof ServerContext>>, '
 	};
 };
 
-const ServerContextMock = ({
-	children,
-	baseURL,
-	callEndpoint = {},
-	callMethod = {},
-	...overrides
-}: ServerContextMockProps): ReactElement => {
+const ServerContextMock = ({ children, baseURL, callEndpoint = {}, callMethod = {}, ...overrides }: ServerContextMockProps) => {
 	const parent = useContext(ServerContext);
 
 	const value = useMemo((): ContextType<typeof ServerContext> => {
diff --git a/apps/meteor/client/stories/contexts/TranslationContextMock.tsx b/apps/meteor/client/stories/contexts/TranslationContextMock.tsx
index 20d0128316f9e..4f16b255a4ef5 100644
--- a/apps/meteor/client/stories/contexts/TranslationContextMock.tsx
+++ b/apps/meteor/client/stories/contexts/TranslationContextMock.tsx
@@ -1,14 +1,14 @@
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import { TranslationContext } from '@rocket.chat/ui-contexts';
 import i18next from 'i18next';
-import type { ContextType, ReactElement, ReactNode } from 'react';
+import type { ContextType, ReactNode } from 'react';
 import { useContext, useMemo } from 'react';
 
 type TranslationContextMockProps = {
 	children: ReactNode;
 };
 
-const TranslationContextMock = ({ children }: TranslationContextMockProps): ReactElement => {
+const TranslationContextMock = ({ children }: TranslationContextMockProps) => {
 	const parent = useContext(TranslationContext);
 
 	const value = useMemo<ContextType<typeof TranslationContext>>(() => {