From 82182f4c473faee75081bff86091de7b28274580 Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso.evangelista@rocket.chat>
Date: Thu, 11 Jun 2026 15:09:32 -0300
Subject: [PATCH 1/8] refactor: upgrade `@types/react` and `@types/react-dom`

---
 .../meteor/client/components/FilterByText.tsx |  4 +-
 .../UserAutoCompleteMultiple.tsx              |  2 +-
 .../SettingsGroupPage/SettingsGroupPage.tsx   |  4 +-
 .../CallHistoryPageFilters.tsx                |  4 +-
 .../TemplatePlaceholderInput.tsx              |  6 +-
 .../directory/contacts/RemoveContactModal.tsx |  4 +-
 .../contexts/SelectedMessagesContext.tsx      |  4 +-
 .../room/composer/messageBox/MessageBox.tsx   |  4 +-
 apps/meteor/package.json                      |  4 +-
 apps/uikit-playground/package.json            |  4 +-
 ee/apps/omnichannel-transcript/package.json   |  2 +-
 ee/packages/pdf-worker/package.json           |  4 +-
 packages/fuselage-ui-kit/package.json         |  4 +-
 packages/gazzodown/package.json               |  4 +-
 packages/livechat/package.json                |  2 +-
 packages/mock-providers/package.json          |  4 +-
 packages/ui-avatar/package.json               |  4 +-
 packages/ui-client/package.json               |  4 +-
 .../MultiSelectCustom/MultiSelectCustom.tsx   |  4 +-
 packages/ui-composer/package.json             |  4 +-
 packages/ui-contexts/package.json             |  4 +-
 packages/ui-video-conf/package.json           |  4 +-
 packages/ui-voip/package.json                 |  4 +-
 packages/web-ui-registration/package.json     |  4 +-
 yarn.lock                                     | 75 +++++++++----------
 25 files changed, 83 insertions(+), 84 deletions(-)

diff --git a/apps/meteor/client/components/FilterByText.tsx b/apps/meteor/client/components/FilterByText.tsx
index 53d4301007776..0addbbc0d4ceb 100644
--- a/apps/meteor/client/components/FilterByText.tsx
+++ b/apps/meteor/client/components/FilterByText.tsx
@@ -1,6 +1,6 @@
 import { Box, Icon, TextInput, Margins } from '@rocket.chat/fuselage';
 import { useAutoFocus, useMergedRefs } from '@rocket.chat/fuselage-hooks';
-import type { ChangeEvent, ComponentPropsWithoutRef, FormEvent } from 'react';
+import type { ChangeEvent, ComponentPropsWithoutRef, SubmitEvent } from 'react';
 import { forwardRef, memo, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -18,7 +18,7 @@ const FilterByText = forwardRef<HTMLInputElement, FilterByTextProps>(function Fi
 	const autoFocusRef = useAutoFocus(shouldAutoFocus);
 	const mergedRefs = useMergedRefs(ref, autoFocusRef);
 
-	const handleFormSubmit = useCallback((event: FormEvent<HTMLFormElement>) => {
+	const handleFormSubmit = useCallback((event: SubmitEvent<HTMLFormElement>) => {
 		event.preventDefault();
 	}, []);
 
diff --git a/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultiple.tsx b/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultiple.tsx
index d4cc3dea17fb7..27af26f58128a 100644
--- a/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultiple.tsx
+++ b/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultiple.tsx
@@ -101,7 +101,7 @@ const UserAutoCompleteMultiple = forwardRef<HTMLInputElement, UserAutoCompleteMu
 					onChange={handleOnChange}
 					filter={filter}
 					setFilter={setFilter}
-					renderSelected={({ value: username, onMouseDown }: { value: string; onMouseDown: () => void }) => {
+					renderSelected={({ value: username, onMouseDown }) => {
 						const currentCachedOption = selectedCache[username] || {};
 
 						return (
diff --git a/apps/meteor/client/views/admin/settings/SettingsGroupPage/SettingsGroupPage.tsx b/apps/meteor/client/views/admin/settings/SettingsGroupPage/SettingsGroupPage.tsx
index afb70452445f6..fcfea0a60c8da 100644
--- a/apps/meteor/client/views/admin/settings/SettingsGroupPage/SettingsGroupPage.tsx
+++ b/apps/meteor/client/views/admin/settings/SettingsGroupPage/SettingsGroupPage.tsx
@@ -4,7 +4,7 @@ import { useStableCallback } from '@rocket.chat/fuselage-hooks';
 import { Page, PageHeader, PageScrollableContentWithShadow, PageFooter } from '@rocket.chat/ui-client';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import { useToastMessageDispatch, useSettingsDispatch, useSettings } from '@rocket.chat/ui-contexts';
-import type { ReactNode, MouseEvent, FormEvent } from 'react';
+import type { ReactNode, MouseEvent, SubmitEvent } from 'react';
 import { useMemo, memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -113,7 +113,7 @@ const SettingsGroupPage = ({
 		dispatchToEditing(settingsToDispatch as Partial<EditableSetting>[]);
 	});
 
-	const handleSubmit = (event: FormEvent<HTMLFormElement>): void => {
+	const handleSubmit = (event: SubmitEvent<HTMLFormElement>): void => {
 		event.preventDefault();
 		save();
 	};
diff --git a/apps/meteor/client/views/mediaCallHistory/CallHistoryPageFilters.tsx b/apps/meteor/client/views/mediaCallHistory/CallHistoryPageFilters.tsx
index e1f333c571db0..5dc0b69179045 100644
--- a/apps/meteor/client/views/mediaCallHistory/CallHistoryPageFilters.tsx
+++ b/apps/meteor/client/views/mediaCallHistory/CallHistoryPageFilters.tsx
@@ -2,7 +2,7 @@ import { Box, Icon, TextInput, Select } from '@rocket.chat/fuselage';
 import type { OptionProp } from '@rocket.chat/ui-client';
 import { MultiSelectCustom } from '@rocket.chat/ui-client';
 import { useCallback, useMemo, useState } from 'react';
-import type { ChangeEvent, Key, FormEvent } from 'react';
+import type { ChangeEvent, Key, SubmitEvent } from 'react';
 import { useTranslation } from 'react-i18next';
 
 type StatesFilter = Array<'ended' | 'transferred' | 'not-answered' | 'failed'>;
@@ -79,7 +79,7 @@ const CallHistoryPageFilters = ({ onChangeText, onChangeType, onChangeStates, se
 	return (
 		<Box
 			is='form'
-			onSubmit={useCallback((e: FormEvent<HTMLFormElement>) => e.preventDefault(), [])}
+			onSubmit={useCallback((e: SubmitEvent<HTMLFormElement>) => e.preventDefault(), [])}
 			mb='x8'
 			display='flex'
 			flexWrap='wrap'
diff --git a/apps/meteor/client/views/omnichannel/components/outboundMessage/components/TemplatePlaceholderSelector/TemplatePlaceholderInput.tsx b/apps/meteor/client/views/omnichannel/components/outboundMessage/components/TemplatePlaceholderSelector/TemplatePlaceholderInput.tsx
index 9c3144ca08794..43e4c0e2f2d50 100644
--- a/apps/meteor/client/views/omnichannel/components/outboundMessage/components/TemplatePlaceholderSelector/TemplatePlaceholderInput.tsx
+++ b/apps/meteor/client/views/omnichannel/components/outboundMessage/components/TemplatePlaceholderSelector/TemplatePlaceholderInput.tsx
@@ -1,7 +1,7 @@
 import type { ILivechatContact, Serialized } from '@rocket.chat/core-typings';
 import { Box, Icon, TextInput } from '@rocket.chat/fuselage';
 import { useStableCallback } from '@rocket.chat/fuselage-hooks';
-import { useRef, type ComponentProps, type FormEvent, type FormEventHandler } from 'react';
+import { useRef, type ChangeEventHandler, type ChangeEvent, type ComponentProps } from 'react';
 
 import PlaceholderSelector from './TemplatePlaceholderSelector';
 import type { TemplateParameter } from '../../types/template';
@@ -16,7 +16,7 @@ type TemplatePlaceholderInputProps = Omit<ComponentProps<typeof TextInput>, 'val
 const TemplatePlaceholderInput = ({ contact, value = '', type, onChange, ...props }: TemplatePlaceholderInputProps) => {
 	const inputRef = useRef<HTMLInputElement>(null);
 
-	const handleChange = (event: FormEvent<HTMLInputElement> | string) => {
+	const handleChange = (event: ChangeEvent<HTMLInputElement> | string) => {
 		onChange(typeof event === 'string' ? event : event.currentTarget.value);
 	};
 
@@ -28,7 +28,7 @@ const TemplatePlaceholderInput = ({ contact, value = '', type, onChange, ...prop
 
 	return (
 		<Box display='flex' width='100%'>
-			<TextInput {...props} ref={inputRef} value={value} addon={addon} onChange={handleChange as FormEventHandler<HTMLElement>} />
+			<TextInput {...props} ref={inputRef} value={value} addon={addon} onChange={handleChange as ChangeEventHandler<HTMLInputElement>} />
 
 			<PlaceholderSelector disabled={type !== 'text'} mis={12} contact={contact} onSelect={handleChange} onOpenChange={handleOpenToggle} />
 		</Box>
diff --git a/apps/meteor/client/views/omnichannel/directory/contacts/RemoveContactModal.tsx b/apps/meteor/client/views/omnichannel/directory/contacts/RemoveContactModal.tsx
index 2547ecd9cb568..cd50f961a1281 100644
--- a/apps/meteor/client/views/omnichannel/directory/contacts/RemoveContactModal.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/contacts/RemoveContactModal.tsx
@@ -3,7 +3,7 @@ import { useStableCallback } from '@rocket.chat/fuselage-hooks';
 import { GenericModal } from '@rocket.chat/ui-client';
 import { useToastMessageDispatch, useEndpoint } from '@rocket.chat/ui-contexts';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
-import type { ChangeEvent, FormEvent } from 'react';
+import type { ChangeEvent, SubmitEvent } from 'react';
 import { useState, useId } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -23,7 +23,7 @@ const RemoveContactModal = ({ _id, name, channelsCount, onClose }: RemoveContact
 	const dispatchToast = useToastMessageDispatch();
 	const contactDeleteModalId = useId();
 
-	const handleSubmit = useStableCallback((event: FormEvent<HTMLFormElement>): void => {
+	const handleSubmit = useStableCallback((event: SubmitEvent<HTMLFormElement>): void => {
 		event.preventDefault();
 		removeContactMutation.mutate();
 	});
diff --git a/apps/meteor/client/views/room/MessageList/contexts/SelectedMessagesContext.tsx b/apps/meteor/client/views/room/MessageList/contexts/SelectedMessagesContext.tsx
index f9c6cb60ce91e..a91ce34a4f440 100644
--- a/apps/meteor/client/views/room/MessageList/contexts/SelectedMessagesContext.tsx
+++ b/apps/meteor/client/views/room/MessageList/contexts/SelectedMessagesContext.tsx
@@ -1,4 +1,4 @@
-import type { FormEvent } from 'react';
+import type { SyntheticEvent } from 'react';
 import { createContext, useCallback, useContext, useEffect, useSyncExternalStore } from 'react';
 
 import { selectedMessageStore } from '../../providers/SelectedMessagesProvider';
@@ -49,7 +49,7 @@ export const useIsSelecting = (): boolean => {
 	return useSyncExternalStore(subscribe, getSnapshot);
 };
 
-export const useToggleSelect = (mid: string): ((event?: FormEvent<HTMLElement>) => void) => {
+export const useToggleSelect = (mid: string): ((event?: SyntheticEvent<HTMLElement>) => void) => {
 	const { selectedMessageStore } = useContext(SelectedMessageContext);
 
 	return useCallback(
diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBox.tsx b/apps/meteor/client/views/room/composer/messageBox/MessageBox.tsx
index ca2baa22c1b7b..7a1c91b1c88fb 100644
--- a/apps/meteor/client/views/room/composer/messageBox/MessageBox.tsx
+++ b/apps/meteor/client/views/room/composer/messageBox/MessageBox.tsx
@@ -13,7 +13,7 @@ import {
 } from '@rocket.chat/ui-composer';
 import { useTranslation, useUserPreference, useLayout, useSetting } from '@rocket.chat/ui-contexts';
 import { useMutation } from '@tanstack/react-query';
-import type { FormEvent, MouseEvent, ClipboardEvent } from 'react';
+import type { MouseEvent, ClipboardEvent, ChangeEvent } from 'react';
 import { memo, useRef, useReducer, useCallback, useSyncExternalStore } from 'react';
 
 import MessageBoxActionsToolbar from './MessageBoxActionsToolbar';
@@ -49,7 +49,7 @@ import { useDraft } from './hooks/useDraft';
 import { useMessageBoxAutoFocus } from './hooks/useMessageBoxAutoFocus';
 import { useMessageBoxPlaceholder } from './hooks/useMessageBoxPlaceholder';
 
-const reducer = (_: unknown, event: FormEvent<HTMLInputElement>): boolean => {
+const reducer = (_: unknown, event: ChangeEvent<HTMLInputElement>): boolean => {
 	const target = event.target as HTMLInputElement;
 
 	return Boolean(target.value.trim());
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index f43fa09b3c04c..7c5485a600a5e 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -387,8 +387,8 @@
 		"@types/proxyquire": "^1.3.31",
 		"@types/psl": "^1.1.3",
 		"@types/qs": "^6.14.0",
-		"@types/react": "~18.3.28",
-		"@types/react-dom": "~18.3.7",
+		"@types/react": "~19.2.17",
+		"@types/react-dom": "~19.2.3",
 		"@types/sanitize-html": "~2.16.1",
 		"@types/semver": "^7.5.8",
 		"@types/sharp": "^0.32.0",
diff --git a/apps/uikit-playground/package.json b/apps/uikit-playground/package.json
index b637e565d21fb..64292cd5db54c 100644
--- a/apps/uikit-playground/package.json
+++ b/apps/uikit-playground/package.json
@@ -43,8 +43,8 @@
 		"@rocket.chat/emitter": "^0.32.0",
 		"@rocket.chat/tsconfig": "workspace:*",
 		"@types/lodash": "~4.17.24",
-		"@types/react": "~18.3.28",
-		"@types/react-dom": "~18.3.7",
+		"@types/react": "~19.2.17",
+		"@types/react-dom": "~19.2.3",
 		"@vitejs/plugin-react": "~6.0.1",
 		"eslint": "~9.39.4",
 		"typescript": "~5.9.3",
diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json
index 7c2cc30b489bd..ef7da69a3686c 100644
--- a/ee/apps/omnichannel-transcript/package.json
+++ b/ee/apps/omnichannel-transcript/package.json
@@ -54,7 +54,7 @@
 		"@types/i18next-sprintf-postprocessor": "^0.2.3",
 		"@types/polka": "^0.5.8",
 		"@types/prometheus-gc-stats": "^0.6.4",
-		"@types/react": "~18.3.28",
+		"@types/react": "~19.2.17",
 		"eslint": "~9.39.4",
 		"react": "~18.3.1",
 		"ts-node": "^10.9.2",
diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json
index 9c37255555010..40666bc468308 100644
--- a/ee/packages/pdf-worker/package.json
+++ b/ee/packages/pdf-worker/package.json
@@ -38,8 +38,8 @@
 		"@testing-library/react": "~16.3.2",
 		"@types/emojione": "^2.2.9",
 		"@types/jest": "~30.0.0",
-		"@types/react": "~18.3.28",
-		"@types/react-dom": "~18.3.7",
+		"@types/react": "~19.2.17",
+		"@types/react-dom": "~19.2.3",
 		"buffer": "~6.0.3",
 		"eslint": "~9.39.4",
 		"i18next": "~23.4.9",
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index 29e1576fc479c..4252615ce06ee 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -65,8 +65,8 @@
 		"@testing-library/dom": "~10.4.1",
 		"@testing-library/react": "~16.3.2",
 		"@testing-library/user-event": "~14.6.1",
-		"@types/react": "~18.3.28",
-		"@types/react-dom": "~18.3.7",
+		"@types/react": "~19.2.17",
+		"@types/react-dom": "~19.2.3",
 		"cross-env": "^7.0.3",
 		"eslint": "~9.39.4",
 		"i18next": "~23.4.9",
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index 4cc548b215269..adf675127bf5f 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -49,8 +49,8 @@
 		"@testing-library/react": "~16.3.2",
 		"@types/jest": "~30.0.0",
 		"@types/katex": "~0.16.8",
-		"@types/react": "~18.3.28",
-		"@types/react-dom": "~18.3.7",
+		"@types/react": "~19.2.17",
+		"@types/react-dom": "~19.2.3",
 		"eslint": "~9.39.4",
 		"i18next": "~23.4.9",
 		"identity-obj-proxy": "^3.0.0",
diff --git a/packages/livechat/package.json b/packages/livechat/package.json
index 68b12fb7292da..84811a8f7fdde 100644
--- a/packages/livechat/package.json
+++ b/packages/livechat/package.json
@@ -68,7 +68,7 @@
 		"@storybook/preact-webpack5": "9.0.0-alpha.11",
 		"@types/crypto-js": "~4.2.2",
 		"@types/mini-css-extract-plugin": "~2.5.1",
-		"@types/react": "~18.3.28",
+		"@types/react": "~19.2.17",
 		"@types/webpack-env": "~1.18.8",
 		"@types/whatwg-fetch": "~0.0.33",
 		"autoprefixer": "^9.8.8",
diff --git a/packages/mock-providers/package.json b/packages/mock-providers/package.json
index 34d6000d189bc..7342ecbc8906f 100644
--- a/packages/mock-providers/package.json
+++ b/packages/mock-providers/package.json
@@ -33,8 +33,8 @@
 		"@testing-library/dom": "~10.4.1",
 		"@testing-library/jest-dom": "~6.8.0",
 		"@testing-library/react": "~16.3.2",
-		"@types/react": "~18.3.28",
-		"@types/react-dom": "~18.3.7",
+		"@types/react": "~19.2.17",
+		"@types/react-dom": "~19.2.3",
 		"eslint": "~9.39.4",
 		"jest": "~30.2.0",
 		"react": "~18.3.1",
diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json
index 10f61ac5b9664..9669e45991af7 100644
--- a/packages/ui-avatar/package.json
+++ b/packages/ui-avatar/package.json
@@ -22,8 +22,8 @@
 		"@rocket.chat/fuselage-tokens": "~0.33.2",
 		"@rocket.chat/icons": "^0.48.0",
 		"@rocket.chat/ui-contexts": "workspace:^",
-		"@types/react": "~18.3.28",
-		"@types/react-dom": "~18.3.7",
+		"@types/react": "~19.2.17",
+		"@types/react-dom": "~19.2.3",
 		"eslint": "~9.39.4",
 		"react": "~18.3.1",
 		"react-dom": "~18.3.1",
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index 7e115a1025ba0..3342dfdd5248e 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -44,8 +44,8 @@
 		"@testing-library/dom": "~10.4.1",
 		"@testing-library/react": "~16.3.2",
 		"@types/jest": "~30.0.0",
-		"@types/react": "~18.3.28",
-		"@types/react-dom": "~18.3.7",
+		"@types/react": "~19.2.17",
+		"@types/react-dom": "~19.2.3",
 		"eslint": "~9.39.4",
 		"i18next": "~23.4.9",
 		"jest": "~30.2.0",
diff --git a/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustom.tsx b/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustom.tsx
index 145b36cc9f35b..305a4eeb1606f 100644
--- a/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustom.tsx
+++ b/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustom.tsx
@@ -2,7 +2,7 @@ import type { Button } from '@rocket.chat/fuselage';
 import { Box } from '@rocket.chat/fuselage';
 import { useButtonPattern, useOutsideClick, useToggle } from '@rocket.chat/fuselage-hooks';
 import type { Keys as IconNames } from '@rocket.chat/icons';
-import type { ComponentPropsWithoutRef, FormEvent, RefObject } from 'react';
+import type { ChangeEvent, ComponentPropsWithoutRef, RefObject } from 'react';
 import { useCallback, useRef } from 'react';
 
 import MultiSelectCustomAnchor from './MultiSelectCustomAnchor';
@@ -80,7 +80,7 @@ export const MultiSelectCustom = ({
 	useOutsideClick([target], onClose);
 
 	const onSelect = useCallback(
-		(selectedOption: OptionProp, e?: FormEvent<HTMLElement>): void => {
+		(selectedOption: OptionProp, e?: ChangeEvent<HTMLElement>): void => {
 			e?.stopPropagation();
 
 			if (selectedOption.hasOwnProperty('checked')) {
diff --git a/packages/ui-composer/package.json b/packages/ui-composer/package.json
index 8ce5b5d47953e..9f663fd497443 100644
--- a/packages/ui-composer/package.json
+++ b/packages/ui-composer/package.json
@@ -35,8 +35,8 @@
 		"@testing-library/react": "~16.3.2",
 		"@testing-library/user-event": "~14.6.1",
 		"@types/jest": "~30.0.0",
-		"@types/react": "~18.3.28",
-		"@types/react-dom": "~18.3.7",
+		"@types/react": "~19.2.17",
+		"@types/react-dom": "~19.2.3",
 		"eslint": "~9.39.4",
 		"jest": "~30.2.0",
 		"react": "~18.3.1",
diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json
index 813ec6f10c463..722b10952e74a 100644
--- a/packages/ui-contexts/package.json
+++ b/packages/ui-contexts/package.json
@@ -32,8 +32,8 @@
 		"@rocket.chat/rest-typings": "workspace:^",
 		"@rocket.chat/tools": "workspace:~",
 		"@types/jest": "~30.0.0",
-		"@types/react": "~18.3.28",
-		"@types/react-dom": "~18.3.7",
+		"@types/react": "~19.2.17",
+		"@types/react-dom": "~19.2.3",
 		"eslint": "~9.39.4",
 		"i18next": "~23.4.9",
 		"jest": "~30.2.0",
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index b4f10d7364ac9..f9bcb3b6dd211 100644
--- a/packages/ui-video-conf/package.json
+++ b/packages/ui-video-conf/package.json
@@ -35,8 +35,8 @@
 		"@storybook/react": "^9.1.13",
 		"@types/jest": "~30.0.0",
 		"@types/jest-axe": "~3.5.9",
-		"@types/react": "~18.3.28",
-		"@types/react-dom": "~18.3.7",
+		"@types/react": "~19.2.17",
+		"@types/react-dom": "~19.2.3",
 		"eslint": "~9.39.4",
 		"jest": "~30.2.0",
 		"jest-axe": "~10.0.0",
diff --git a/packages/ui-voip/package.json b/packages/ui-voip/package.json
index e2c3572044030..1b05501ca55ba 100644
--- a/packages/ui-voip/package.json
+++ b/packages/ui-voip/package.json
@@ -53,8 +53,8 @@
 		"@types/jest": "~30.0.0",
 		"@types/jest-axe": "~3.5.9",
 		"@types/node": "~22.19.17",
-		"@types/react": "~18.3.28",
-		"@types/react-dom": "~18.3.7",
+		"@types/react": "~19.2.17",
+		"@types/react-dom": "~19.2.3",
 		"date-fns": "~4.1.0",
 		"eslint": "~9.39.4",
 		"i18next": "~23.4.9",
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index 102af599a0aeb..7d87e53dc860e 100644
--- a/packages/web-ui-registration/package.json
+++ b/packages/web-ui-registration/package.json
@@ -39,8 +39,8 @@
 		"@tanstack/react-query": "~5.65.1",
 		"@testing-library/dom": "~10.4.1",
 		"@testing-library/react": "~16.3.2",
-		"@types/react": "~18.3.28",
-		"@types/react-dom": "~18.3.7",
+		"@types/react": "~19.2.17",
+		"@types/react-dom": "~19.2.3",
 		"eslint": "~9.39.4",
 		"i18next": "~23.4.9",
 		"react": "~18.3.1",
diff --git a/yarn.lock b/yarn.lock
index 762d3c1a558e8..d785a96cb6bf9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9423,8 +9423,8 @@ __metadata:
     "@testing-library/dom": "npm:~10.4.1"
     "@testing-library/react": "npm:~16.3.2"
     "@testing-library/user-event": "npm:~14.6.1"
-    "@types/react": "npm:~18.3.28"
-    "@types/react-dom": "npm:~18.3.7"
+    "@types/react": "npm:~19.2.17"
+    "@types/react-dom": "npm:~19.2.3"
     cross-env: "npm:^7.0.3"
     eslint: "npm:~9.39.4"
     i18next: "npm:~23.4.9"
@@ -9505,8 +9505,8 @@ __metadata:
     "@testing-library/react": "npm:~16.3.2"
     "@types/jest": "npm:~30.0.0"
     "@types/katex": "npm:~0.16.8"
-    "@types/react": "npm:~18.3.28"
-    "@types/react-dom": "npm:~18.3.7"
+    "@types/react": "npm:~19.2.17"
+    "@types/react-dom": "npm:~19.2.3"
     date-fns: "npm:~4.1.0"
     dompurify: "npm:~3.4.7"
     eslint: "npm:~9.39.4"
@@ -9697,7 +9697,7 @@ __metadata:
     "@storybook/preact-webpack5": "npm:9.0.0-alpha.11"
     "@types/crypto-js": "npm:~4.2.2"
     "@types/mini-css-extract-plugin": "npm:~2.5.1"
-    "@types/react": "npm:~18.3.28"
+    "@types/react": "npm:~19.2.17"
     "@types/webpack-env": "npm:~1.18.8"
     "@types/whatwg-fetch": "npm:~0.0.33"
     ajv: "npm:^8.20.0"
@@ -10054,8 +10054,8 @@ __metadata:
     "@types/proxyquire": "npm:^1.3.31"
     "@types/psl": "npm:^1.1.3"
     "@types/qs": "npm:^6.14.0"
-    "@types/react": "npm:~18.3.28"
-    "@types/react-dom": "npm:~18.3.7"
+    "@types/react": "npm:~19.2.17"
+    "@types/react-dom": "npm:~19.2.3"
     "@types/sanitize-html": "npm:~2.16.1"
     "@types/semver": "npm:^7.5.8"
     "@types/sharp": "npm:^0.32.0"
@@ -10289,8 +10289,8 @@ __metadata:
     "@testing-library/dom": "npm:~10.4.1"
     "@testing-library/jest-dom": "npm:~6.8.0"
     "@testing-library/react": "npm:~16.3.2"
-    "@types/react": "npm:~18.3.28"
-    "@types/react-dom": "npm:~18.3.7"
+    "@types/react": "npm:~19.2.17"
+    "@types/react-dom": "npm:~19.2.3"
     eslint: "npm:~9.39.4"
     i18next: "npm:~23.4.9"
     jest: "npm:~30.2.0"
@@ -10477,7 +10477,7 @@ __metadata:
     "@types/node": "npm:~22.19.17"
     "@types/polka": "npm:^0.5.8"
     "@types/prometheus-gc-stats": "npm:^0.6.4"
-    "@types/react": "npm:~18.3.28"
+    "@types/react": "npm:~19.2.17"
     ejson: "npm:^2.2.3"
     emoji-toolkit: "npm:^7.0.1"
     eslint: "npm:~9.39.4"
@@ -10563,8 +10563,8 @@ __metadata:
     "@testing-library/react": "npm:~16.3.2"
     "@types/emojione": "npm:^2.2.9"
     "@types/jest": "npm:~30.0.0"
-    "@types/react": "npm:~18.3.28"
-    "@types/react-dom": "npm:~18.3.7"
+    "@types/react": "npm:~19.2.17"
+    "@types/react-dom": "npm:~19.2.3"
     buffer: "npm:~6.0.3"
     emoji-toolkit: "npm:^7.0.1"
     eslint: "npm:~9.39.4"
@@ -10915,8 +10915,8 @@ __metadata:
     "@rocket.chat/fuselage-tokens": "npm:~0.33.2"
     "@rocket.chat/icons": "npm:^0.48.0"
     "@rocket.chat/ui-contexts": "workspace:^"
-    "@types/react": "npm:~18.3.28"
-    "@types/react-dom": "npm:~18.3.7"
+    "@types/react": "npm:~19.2.17"
+    "@types/react-dom": "npm:~19.2.3"
     eslint: "npm:~9.39.4"
     react: "npm:~18.3.1"
     react-dom: "npm:~18.3.1"
@@ -10956,8 +10956,8 @@ __metadata:
     "@testing-library/dom": "npm:~10.4.1"
     "@testing-library/react": "npm:~16.3.2"
     "@types/jest": "npm:~30.0.0"
-    "@types/react": "npm:~18.3.28"
-    "@types/react-dom": "npm:~18.3.7"
+    "@types/react": "npm:~19.2.17"
+    "@types/react-dom": "npm:~19.2.3"
     dompurify: "npm:~3.4.7"
     eslint: "npm:~9.39.4"
     i18next: "npm:~23.4.9"
@@ -11007,8 +11007,8 @@ __metadata:
     "@testing-library/react": "npm:~16.3.2"
     "@testing-library/user-event": "npm:~14.6.1"
     "@types/jest": "npm:~30.0.0"
-    "@types/react": "npm:~18.3.28"
-    "@types/react-dom": "npm:~18.3.7"
+    "@types/react": "npm:~19.2.17"
+    "@types/react-dom": "npm:~19.2.3"
     eslint: "npm:~9.39.4"
     jest: "npm:~30.2.0"
     react: "npm:~18.3.1"
@@ -11044,8 +11044,8 @@ __metadata:
     "@rocket.chat/rest-typings": "workspace:^"
     "@rocket.chat/tools": "workspace:~"
     "@types/jest": "npm:~30.0.0"
-    "@types/react": "npm:~18.3.28"
-    "@types/react-dom": "npm:~18.3.7"
+    "@types/react": "npm:~19.2.17"
+    "@types/react-dom": "npm:~19.2.3"
     eslint: "npm:~9.39.4"
     i18next: "npm:~23.4.9"
     jest: "npm:~30.2.0"
@@ -11106,8 +11106,8 @@ __metadata:
     "@storybook/react": "npm:^9.1.13"
     "@types/jest": "npm:~30.0.0"
     "@types/jest-axe": "npm:~3.5.9"
-    "@types/react": "npm:~18.3.28"
-    "@types/react-dom": "npm:~18.3.7"
+    "@types/react": "npm:~19.2.17"
+    "@types/react-dom": "npm:~19.2.3"
     eslint: "npm:~9.39.4"
     jest: "npm:~30.2.0"
     jest-axe: "npm:~10.0.0"
@@ -11164,8 +11164,8 @@ __metadata:
     "@types/jest": "npm:~30.0.0"
     "@types/jest-axe": "npm:~3.5.9"
     "@types/node": "npm:~22.19.17"
-    "@types/react": "npm:~18.3.28"
-    "@types/react-dom": "npm:~18.3.7"
+    "@types/react": "npm:~19.2.17"
+    "@types/react-dom": "npm:~19.2.3"
     date-fns: "npm:~4.1.0"
     eslint: "npm:~9.39.4"
     i18next: "npm:~23.4.9"
@@ -11218,8 +11218,8 @@ __metadata:
     "@rocket.chat/ui-avatar": "workspace:^"
     "@rocket.chat/ui-contexts": "workspace:~"
     "@types/lodash": "npm:~4.17.24"
-    "@types/react": "npm:~18.3.28"
-    "@types/react-dom": "npm:~18.3.7"
+    "@types/react": "npm:~19.2.17"
+    "@types/react-dom": "npm:~19.2.3"
     "@vitejs/plugin-react": "npm:~6.0.1"
     codemirror: "npm:^6.0.2"
     eslint: "npm:~9.39.4"
@@ -11260,8 +11260,8 @@ __metadata:
     "@tanstack/react-query": "npm:~5.65.1"
     "@testing-library/dom": "npm:~10.4.1"
     "@testing-library/react": "npm:~16.3.2"
-    "@types/react": "npm:~18.3.28"
-    "@types/react-dom": "npm:~18.3.7"
+    "@types/react": "npm:~19.2.17"
+    "@types/react-dom": "npm:~19.2.3"
     dompurify: "npm:~3.4.7"
     eslint: "npm:~9.39.4"
     i18next: "npm:~23.4.9"
@@ -14725,12 +14725,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react-dom@npm:~18.3.7":
-  version: 18.3.7
-  resolution: "@types/react-dom@npm:18.3.7"
+"@types/react-dom@npm:~19.2.3":
+  version: 19.2.3
+  resolution: "@types/react-dom@npm:19.2.3"
   peerDependencies:
-    "@types/react": ^18.0.0
-  checksum: 10/317569219366d487a3103ba1e5e47154e95a002915fdcf73a44162c48fe49c3a57fcf7f57fc6979e70d447112681e6b13c6c3c1df289db8b544df4aab2d318f3
+    "@types/react": ^19.2.0
+  checksum: 10/616c4a8aee250ea05fb1e7b98e7e00475dd3a6c1c30d7be18b4b93caba832f4203106b3a496a6b147e5acc2da14575eca47bce234c633bca1f8430ef8ffb234a
   languageName: node
   linkType: hard
 
@@ -14744,13 +14744,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react@npm:~18.3.28":
-  version: 18.3.28
-  resolution: "@types/react@npm:18.3.28"
+"@types/react@npm:~19.2.17":
+  version: 19.2.17
+  resolution: "@types/react@npm:19.2.17"
   dependencies:
-    "@types/prop-types": "npm:*"
     csstype: "npm:^3.2.2"
-  checksum: 10/6db7bb7f19957ee9f530baa7d143527f8befedad1585b064eb80777be0d84621157de75aba4f499ff429b10c5ef0c7d13e89be6bca3296ef71c80472894ff0eb
+  checksum: 10/8debb092bd0bb9c99176a31824c7587c27c775a6526b60060e7b9e8dc2af53aee2ffadc7a1e3845953792437db5699d34a9054e198c9d4e54a74728ff47c6725
   languageName: node
   linkType: hard
 

From ef66fc96abd1a6c7807ed6763afd9fdcbdb60e4e Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso.evangelista@rocket.chat>
Date: Fri, 12 Jun 2026 16:55:35 -0300
Subject: [PATCH 2/8] refactor: upgrade `react` and `react-dom`

---
 .../realTimeMonitoring/counter/CounterRow.tsx |   4 +-
 apps/meteor/package.json                      |   8 +-
 apps/uikit-playground/package.json            |   4 +-
 ee/apps/omnichannel-transcript/package.json   |   2 +-
 ee/packages/pdf-worker/package.json           |   4 +-
 packages/fuselage-ui-kit/package.json         |   4 +-
 packages/gazzodown/package.json               |   4 +-
 packages/livechat/package.json                |   4 +-
 packages/mock-providers/package.json          |   4 +-
 packages/storybook-config/package.json        |   4 +-
 packages/ui-avatar/package.json               |   4 +-
 packages/ui-client/package.json               |   4 +-
 packages/ui-composer/package.json             |   4 +-
 packages/ui-contexts/package.json             |   4 +-
 packages/ui-video-conf/package.json           |   4 +-
 packages/ui-voip/package.json                 |   4 +-
 packages/web-ui-registration/package.json     |   4 +-
 yarn.lock                                     | 136 ++++++++++--------
 18 files changed, 110 insertions(+), 96 deletions(-)

diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterRow.tsx b/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterRow.tsx
index 291aa0f391ccd..1ae080c170daa 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterRow.tsx
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterRow.tsx
@@ -11,7 +11,7 @@ const CounterRow = ({ children, ...props }: CounterRowProps) => (
 	<Box pb={28} pi={20} display='flex' flexDirection='row' justifyContent='space-around' alignItems='center' flexGrow={1} {...props}>
 		{children &&
 			flattenChildren(children).reduce(
-				(acc, child, i) =>
+				(acc: ReactNode[], child, i) =>
 					children.length - 1 !== i
 						? [
 								...acc,
@@ -19,7 +19,7 @@ const CounterRow = ({ children, ...props }: CounterRowProps) => (
 								<Divider key={(i + 1) * children.length} width='x2' m='none' alignSelf='stretch' />,
 							]
 						: [...acc, child],
-				[] as ReactNode[],
+				[],
 			)}
 	</Box>
 );
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index 7c5485a600a5e..e3d9d9b80a883 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -273,13 +273,14 @@
 		"query-string": "^7.1.3",
 		"queue-fifo": "^0.2.6",
 		"re-resizable": "^6.10.4",
-		"react": "~18.3.1",
+		"react": "~19.2.7",
 		"react-aria": "~3.37.0",
-		"react-dom": "~18.3.1",
+		"react-dom": "~19.2.7",
 		"react-error-boundary": "^3.1.4",
 		"react-hook-form": "~7.45.4",
 		"react-i18next": "~13.2.2",
-		"react-keyed-flatten-children": "^3.0.2",
+		"react-is": "~19.2.7",
+		"react-keyed-flatten-children": "~5.1.2",
 		"react-stately": "~3.17.0",
 		"react-virtuoso": "~4.12.8",
 		"reflect-metadata": "^0.2.2",
@@ -389,6 +390,7 @@
 		"@types/qs": "^6.14.0",
 		"@types/react": "~19.2.17",
 		"@types/react-dom": "~19.2.3",
+		"@types/react-is": "^19",
 		"@types/sanitize-html": "~2.16.1",
 		"@types/semver": "^7.5.8",
 		"@types/sharp": "^0.32.0",
diff --git a/apps/uikit-playground/package.json b/apps/uikit-playground/package.json
index 64292cd5db54c..0adbd4c2484a6 100644
--- a/apps/uikit-playground/package.json
+++ b/apps/uikit-playground/package.json
@@ -32,8 +32,8 @@
 		"eslint4b-prebuilt": "^6.7.2",
 		"prettier": "~3.3.3",
 		"rc-scrollbars": "^1.1.6",
-		"react": "~18.3.1",
-		"react-dom": "~18.3.1",
+		"react": "~19.2.7",
+		"react-dom": "~19.2.7",
 		"react-router-dom": "^6.30.4",
 		"react-split-pane": "^0.1.92",
 		"react-virtuoso": "~4.12.8",
diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json
index ef7da69a3686c..b6c2709b4472a 100644
--- a/ee/apps/omnichannel-transcript/package.json
+++ b/ee/apps/omnichannel-transcript/package.json
@@ -56,7 +56,7 @@
 		"@types/prometheus-gc-stats": "^0.6.4",
 		"@types/react": "~19.2.17",
 		"eslint": "~9.39.4",
-		"react": "~18.3.1",
+		"react": "~19.2.7",
 		"ts-node": "^10.9.2",
 		"typescript": "~5.9.3"
 	},
diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json
index 40666bc468308..84a39f1a42549 100644
--- a/ee/packages/pdf-worker/package.json
+++ b/ee/packages/pdf-worker/package.json
@@ -24,7 +24,7 @@
 		"emoji-toolkit": "^7.0.1",
 		"moment": "^2.30.1",
 		"moment-timezone": "^0.5.48",
-		"react": "~18.3.1",
+		"react": "~19.2.7",
 		"react-i18next": "~13.2.2"
 	},
 	"devDependencies": {
@@ -45,7 +45,7 @@
 		"i18next": "~23.4.9",
 		"jest": "~30.2.0",
 		"path-browserify": "^1.0.1",
-		"react-dom": "~18.3.1",
+		"react-dom": "~19.2.7",
 		"storybook": "^9.1.13",
 		"typescript": "~5.9.3"
 	},
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index 4252615ce06ee..b403d0e817f1b 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -74,8 +74,8 @@
 		"normalize.css": "^8.0.1",
 		"npm-run-all": "^4.1.5",
 		"prettier": "~3.3.3",
-		"react": "~18.3.1",
-		"react-dom": "~18.3.1",
+		"react": "~19.2.7",
+		"react-dom": "~19.2.7",
 		"react-i18next": "~13.2.2",
 		"react-virtuoso": "~4.12.8",
 		"rimraf": "^6.0.1",
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index adf675127bf5f..77acfcadef300 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -57,9 +57,9 @@
 		"jest": "~30.2.0",
 		"katex": "~0.16.45",
 		"outdent": "^0.8.0",
-		"react": "~18.3.1",
+		"react": "~19.2.7",
 		"react-aria": "~3.37.0",
-		"react-dom": "~18.3.1",
+		"react-dom": "~19.2.7",
 		"react-i18next": "~13.2.2",
 		"react-virtuoso": "~4.12.8",
 		"storybook": "^9.1.13",
diff --git a/packages/livechat/package.json b/packages/livechat/package.json
index 84811a8f7fdde..c0cdf3511260c 100644
--- a/packages/livechat/package.json
+++ b/packages/livechat/package.json
@@ -92,8 +92,8 @@
 		"postcss-logical": "^8.0.0",
 		"postcss-scss": "^4.0.9",
 		"postcss-selector-not": "^8.0.1",
-		"react": "~18.3.1",
-		"react-dom": "~18.3.1",
+		"react": "~19.2.7",
+		"react-dom": "~19.2.7",
 		"resolve-url-loader": "~5.0.0",
 		"rimraf": "^6.0.1",
 		"sass": "~1.80.7",
diff --git a/packages/mock-providers/package.json b/packages/mock-providers/package.json
index 7342ecbc8906f..a7d2a1d4d26e5 100644
--- a/packages/mock-providers/package.json
+++ b/packages/mock-providers/package.json
@@ -37,8 +37,8 @@
 		"@types/react-dom": "~19.2.3",
 		"eslint": "~9.39.4",
 		"jest": "~30.2.0",
-		"react": "~18.3.1",
-		"react-dom": "~18.3.1",
+		"react": "~19.2.7",
+		"react-dom": "~19.2.7",
 		"storybook": "^9.1.13",
 		"typescript": "~5.9.3"
 	},
diff --git a/packages/storybook-config/package.json b/packages/storybook-config/package.json
index d4b90356ef723..df438cd84cd55 100644
--- a/packages/storybook-config/package.json
+++ b/packages/storybook-config/package.json
@@ -38,8 +38,8 @@
 		"@rocket.chat/tsconfig": "workspace:*",
 		"@storybook/react": "^9.1.13",
 		"eslint": "~9.39.4",
-		"react": "~18.3.1",
-		"react-dom": "~18.3.1",
+		"react": "~19.2.7",
+		"react-dom": "~19.2.7",
 		"typescript": "~5.9.3"
 	},
 	"peerDependencies": {
diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json
index 9669e45991af7..d1815b670bec1 100644
--- a/packages/ui-avatar/package.json
+++ b/packages/ui-avatar/package.json
@@ -25,8 +25,8 @@
 		"@types/react": "~19.2.17",
 		"@types/react-dom": "~19.2.3",
 		"eslint": "~9.39.4",
-		"react": "~18.3.1",
-		"react-dom": "~18.3.1",
+		"react": "~19.2.7",
+		"react-dom": "~19.2.7",
 		"react-virtuoso": "~4.12.8",
 		"typescript": "~5.9.3"
 	},
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index 3342dfdd5248e..cba543ae7fd24 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -52,8 +52,8 @@
 		"overlayscrollbars": "~2.11.5",
 		"overlayscrollbars-react": "^0.5.6",
 		"re-resizable": "^6.10.4",
-		"react": "~18.3.1",
-		"react-dom": "~18.3.1",
+		"react": "~19.2.7",
+		"react-dom": "~19.2.7",
 		"react-hook-form": "~7.45.4",
 		"react-i18next": "~13.2.2",
 		"react-virtuoso": "~4.12.8",
diff --git a/packages/ui-composer/package.json b/packages/ui-composer/package.json
index 9f663fd497443..877f8c6bed124 100644
--- a/packages/ui-composer/package.json
+++ b/packages/ui-composer/package.json
@@ -39,8 +39,8 @@
 		"@types/react-dom": "~19.2.3",
 		"eslint": "~9.39.4",
 		"jest": "~30.2.0",
-		"react": "~18.3.1",
-		"react-dom": "~18.3.1",
+		"react": "~19.2.7",
+		"react-dom": "~19.2.7",
 		"react-virtuoso": "~4.12.8",
 		"storybook": "^9.1.13",
 		"typescript": "~5.9.3",
diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json
index 722b10952e74a..bf01755803dba 100644
--- a/packages/ui-contexts/package.json
+++ b/packages/ui-contexts/package.json
@@ -38,8 +38,8 @@
 		"i18next": "~23.4.9",
 		"jest": "~30.2.0",
 		"mongodb": "6.16.0",
-		"react": "~18.3.1",
-		"react-dom": "~18.3.1",
+		"react": "~19.2.7",
+		"react-dom": "~19.2.7",
 		"react-virtuoso": "~4.12.8",
 		"typescript": "~5.9.3"
 	},
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index f9bcb3b6dd211..f4b83668b0746 100644
--- a/packages/ui-video-conf/package.json
+++ b/packages/ui-video-conf/package.json
@@ -40,8 +40,8 @@
 		"eslint": "~9.39.4",
 		"jest": "~30.2.0",
 		"jest-axe": "~10.0.0",
-		"react": "~18.3.1",
-		"react-dom": "~18.3.1",
+		"react": "~19.2.7",
+		"react-dom": "~19.2.7",
 		"react-virtuoso": "~4.12.8",
 		"storybook": "^9.1.13",
 		"typescript": "~5.9.3",
diff --git a/packages/ui-voip/package.json b/packages/ui-voip/package.json
index 1b05501ca55ba..06c3b01ed364b 100644
--- a/packages/ui-voip/package.json
+++ b/packages/ui-voip/package.json
@@ -61,8 +61,8 @@
 		"jest": "~30.2.0",
 		"jest-axe": "~10.0.0",
 		"jsdom": "^26.1.0",
-		"react": "~18.3.1",
-		"react-dom": "~18.3.1",
+		"react": "~19.2.7",
+		"react-dom": "~19.2.7",
 		"react-virtuoso": "~4.12.8",
 		"storybook": "^9.1.13",
 		"typescript": "~5.9.3"
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index 7d87e53dc860e..5f428c27fb3d3 100644
--- a/packages/web-ui-registration/package.json
+++ b/packages/web-ui-registration/package.json
@@ -43,8 +43,8 @@
 		"@types/react-dom": "~19.2.3",
 		"eslint": "~9.39.4",
 		"i18next": "~23.4.9",
-		"react": "~18.3.1",
-		"react-dom": "~18.3.1",
+		"react": "~19.2.7",
+		"react-dom": "~19.2.7",
 		"react-hook-form": "~7.45.4",
 		"react-i18next": "~13.2.2",
 		"react-virtuoso": "~4.12.8",
diff --git a/yarn.lock b/yarn.lock
index d785a96cb6bf9..dd99c9b5e4629 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9432,8 +9432,8 @@ __metadata:
     normalize.css: "npm:^8.0.1"
     npm-run-all: "npm:^4.1.5"
     prettier: "npm:~3.3.3"
-    react: "npm:~18.3.1"
-    react-dom: "npm:~18.3.1"
+    react: "npm:~19.2.7"
+    react-dom: "npm:~19.2.7"
     react-i18next: "npm:~13.2.2"
     react-virtuoso: "npm:~4.12.8"
     rimraf: "npm:^6.0.1"
@@ -9516,9 +9516,9 @@ __metadata:
     jest: "npm:~30.2.0"
     katex: "npm:~0.16.45"
     outdent: "npm:^0.8.0"
-    react: "npm:~18.3.1"
+    react: "npm:~19.2.7"
     react-aria: "npm:~3.37.0"
-    react-dom: "npm:~18.3.1"
+    react-dom: "npm:~19.2.7"
     react-error-boundary: "npm:^3.1.4"
     react-i18next: "npm:~13.2.2"
     react-stately: "npm:~3.17.0"
@@ -9734,8 +9734,8 @@ __metadata:
     preact: "npm:~10.25.4"
     preact-router: "npm:^4.1.2"
     query-string: "npm:^7.1.3"
-    react: "npm:~18.3.1"
-    react-dom: "npm:~18.3.1"
+    react: "npm:~19.2.7"
+    react-dom: "npm:~19.2.7"
     react-hook-form: "npm:~7.45.4"
     react-i18next: "npm:~13.2.2"
     resolve-url-loader: "npm:~5.0.0"
@@ -10056,6 +10056,7 @@ __metadata:
     "@types/qs": "npm:^6.14.0"
     "@types/react": "npm:~19.2.17"
     "@types/react-dom": "npm:~19.2.3"
+    "@types/react-is": "npm:^19"
     "@types/sanitize-html": "npm:~2.16.1"
     "@types/semver": "npm:^7.5.8"
     "@types/sharp": "npm:^0.32.0"
@@ -10213,14 +10214,15 @@ __metadata:
     queue-fifo: "npm:^0.2.6"
     raw-loader: "npm:~4.0.2"
     re-resizable: "npm:^6.10.4"
-    react: "npm:~18.3.1"
+    react: "npm:~19.2.7"
     react-aria: "npm:~3.37.0"
     react-docgen-typescript-plugin: "npm:^1.0.8"
-    react-dom: "npm:~18.3.1"
+    react-dom: "npm:~19.2.7"
     react-error-boundary: "npm:^3.1.4"
     react-hook-form: "npm:~7.45.4"
     react-i18next: "npm:~13.2.2"
-    react-keyed-flatten-children: "npm:^3.0.2"
+    react-is: "npm:~19.2.7"
+    react-keyed-flatten-children: "npm:~5.1.2"
     react-stately: "npm:~3.17.0"
     react-virtuoso: "npm:~4.12.8"
     reflect-metadata: "npm:^0.2.2"
@@ -10294,8 +10296,8 @@ __metadata:
     eslint: "npm:~9.39.4"
     i18next: "npm:~23.4.9"
     jest: "npm:~30.2.0"
-    react: "npm:~18.3.1"
-    react-dom: "npm:~18.3.1"
+    react: "npm:~19.2.7"
+    react-dom: "npm:~19.2.7"
     react-i18next: "npm:~13.2.2"
     storybook: "npm:^9.1.13"
     typescript: "npm:~5.9.3"
@@ -10494,7 +10496,7 @@ __metadata:
     polka: "npm:^0.5.2"
     prom-client: "npm:^14.2.0"
     prometheus-gc-stats: "npm:^1.1.0"
-    react: "npm:~18.3.1"
+    react: "npm:~19.2.7"
     ts-node: "npm:^10.9.2"
     typescript: "npm:~5.9.3"
   languageName: unknown
@@ -10573,8 +10575,8 @@ __metadata:
     moment: "npm:^2.30.1"
     moment-timezone: "npm:^0.5.48"
     path-browserify: "npm:^1.0.1"
-    react: "npm:~18.3.1"
-    react-dom: "npm:~18.3.1"
+    react: "npm:~19.2.7"
+    react-dom: "npm:~19.2.7"
     react-i18next: "npm:~13.2.2"
     storybook: "npm:^9.1.13"
     typescript: "npm:~5.9.3"
@@ -10827,8 +10829,8 @@ __metadata:
     "@storybook/react": "npm:^9.1.13"
     "@storybook/react-webpack5": "npm:^9.1.13"
     eslint: "npm:~9.39.4"
-    react: "npm:~18.3.1"
-    react-dom: "npm:~18.3.1"
+    react: "npm:~19.2.7"
+    react-dom: "npm:~19.2.7"
     react-virtuoso: "npm:~4.12.8"
     storybook: "npm:^9.1.13"
     storybook-dark-mode: "npm:^5.0.0"
@@ -10918,8 +10920,8 @@ __metadata:
     "@types/react": "npm:~19.2.17"
     "@types/react-dom": "npm:~19.2.3"
     eslint: "npm:~9.39.4"
-    react: "npm:~18.3.1"
-    react-dom: "npm:~18.3.1"
+    react: "npm:~19.2.7"
+    react-dom: "npm:~19.2.7"
     react-virtuoso: "npm:~4.12.8"
     typescript: "npm:~5.9.3"
   peerDependencies:
@@ -10965,8 +10967,8 @@ __metadata:
     overlayscrollbars: "npm:~2.11.5"
     overlayscrollbars-react: "npm:^0.5.6"
     re-resizable: "npm:^6.10.4"
-    react: "npm:~18.3.1"
-    react-dom: "npm:~18.3.1"
+    react: "npm:~19.2.7"
+    react-dom: "npm:~19.2.7"
     react-hook-form: "npm:~7.45.4"
     react-i18next: "npm:~13.2.2"
     react-virtuoso: "npm:~4.12.8"
@@ -11011,8 +11013,8 @@ __metadata:
     "@types/react-dom": "npm:~19.2.3"
     eslint: "npm:~9.39.4"
     jest: "npm:~30.2.0"
-    react: "npm:~18.3.1"
-    react-dom: "npm:~18.3.1"
+    react: "npm:~19.2.7"
+    react-dom: "npm:~19.2.7"
     react-virtuoso: "npm:~4.12.8"
     storybook: "npm:^9.1.13"
     typescript: "npm:~5.9.3"
@@ -11050,8 +11052,8 @@ __metadata:
     i18next: "npm:~23.4.9"
     jest: "npm:~30.2.0"
     mongodb: "npm:6.16.0"
-    react: "npm:~18.3.1"
-    react-dom: "npm:~18.3.1"
+    react: "npm:~19.2.7"
+    react-dom: "npm:~19.2.7"
     react-virtuoso: "npm:~4.12.8"
     typescript: "npm:~5.9.3"
   peerDependencies:
@@ -11111,8 +11113,8 @@ __metadata:
     eslint: "npm:~9.39.4"
     jest: "npm:~30.2.0"
     jest-axe: "npm:~10.0.0"
-    react: "npm:~18.3.1"
-    react-dom: "npm:~18.3.1"
+    react: "npm:~19.2.7"
+    react-dom: "npm:~19.2.7"
     react-virtuoso: "npm:~4.12.8"
     storybook: "npm:^9.1.13"
     typescript: "npm:~5.9.3"
@@ -11172,8 +11174,8 @@ __metadata:
     jest: "npm:~30.2.0"
     jest-axe: "npm:~10.0.0"
     jsdom: "npm:^26.1.0"
-    react: "npm:~18.3.1"
-    react-dom: "npm:~18.3.1"
+    react: "npm:~19.2.7"
+    react-dom: "npm:~19.2.7"
     react-i18next: "npm:~13.2.2"
     react-virtuoso: "npm:~4.12.8"
     storybook: "npm:^9.1.13"
@@ -11226,8 +11228,8 @@ __metadata:
     eslint4b-prebuilt: "npm:^6.7.2"
     prettier: "npm:~3.3.3"
     rc-scrollbars: "npm:^1.1.6"
-    react: "npm:~18.3.1"
-    react-dom: "npm:~18.3.1"
+    react: "npm:~19.2.7"
+    react-dom: "npm:~19.2.7"
     react-router-dom: "npm:^6.30.4"
     react-split-pane: "npm:^0.1.92"
     react-virtuoso: "npm:~4.12.8"
@@ -11265,8 +11267,8 @@ __metadata:
     dompurify: "npm:~3.4.7"
     eslint: "npm:~9.39.4"
     i18next: "npm:~23.4.9"
-    react: "npm:~18.3.1"
-    react-dom: "npm:~18.3.1"
+    react: "npm:~19.2.7"
+    react-dom: "npm:~19.2.7"
     react-hook-form: "npm:~7.45.4"
     react-i18next: "npm:~13.2.2"
     react-virtuoso: "npm:~4.12.8"
@@ -14734,6 +14736,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/react-is@npm:^19":
+  version: 19.2.0
+  resolution: "@types/react-is@npm:19.2.0"
+  dependencies:
+    "@types/react": "npm:*"
+  checksum: 10/cf684b259dd0c60bb07df38e1b51a57728101b8cdde9d06209388e9a22daa64a6e36a8c7945f8d029a588c4a0d6540857ccbf52b7ec98ef083b4cee6ca4a3ee4
+  languageName: node
+  linkType: hard
+
 "@types/react@npm:*":
   version: 18.3.23
   resolution: "@types/react@npm:18.3.23"
@@ -31899,15 +31910,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-dom@npm:~18.3.1":
-  version: 18.3.1
-  resolution: "react-dom@npm:18.3.1"
+"react-dom@npm:~19.2.7":
+  version: 19.2.7
+  resolution: "react-dom@npm:19.2.7"
   dependencies:
-    loose-envify: "npm:^1.1.0"
-    scheduler: "npm:^0.23.2"
+    scheduler: "npm:^0.27.0"
   peerDependencies:
-    react: ^18.3.1
-  checksum: 10/3f4b73a3aa083091173b29812b10394dd06f4ac06aff410b74702cfb3aa29d7b0ced208aab92d5272919b612e5cda21aeb1d54191848cf6e46e9e354f3541f81
+    react: ^19.2.7
+  checksum: 10/9564f4b83843ca5518ed5f807c93cb1663706559cde52f3ef814b41e60b63b16e684d849926458f0ba436745d7eabf822cba1c528be370e7b2f35a4c91e35941
   languageName: node
   linkType: hard
 
@@ -31972,13 +31982,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-is@npm:^18.0.0, react-is@npm:^18.2.0, react-is@npm:^18.3.1":
+"react-is@npm:^18.0.0, react-is@npm:^18.3.1":
   version: 18.3.1
   resolution: "react-is@npm:18.3.1"
   checksum: 10/d5f60c87d285af24b1e1e7eaeb123ec256c3c8bdea7061ab3932e3e14685708221bf234ec50b21e10dd07f008f1b966a2730a0ce4ff67905b3872ff2042aec22
   languageName: node
   linkType: hard
 
+"react-is@npm:~19.2.7":
+  version: 19.2.7
+  resolution: "react-is@npm:19.2.7"
+  checksum: 10/ae0d3ae7638aa2fa2a82a78a817daf2806e57fa0aef357d07e1e8d1e9a301902e5967168e9334b5816db0df8fa980a725cd57569ba5a9e6e76a71e117b18be04
+  languageName: node
+  linkType: hard
+
 "react-keyed-flatten-children@npm:^1.3.0":
   version: 1.3.0
   resolution: "react-keyed-flatten-children@npm:1.3.0"
@@ -31990,14 +32007,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-keyed-flatten-children@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "react-keyed-flatten-children@npm:3.0.2"
-  dependencies:
-    react-is: "npm:^18.2.0"
+"react-keyed-flatten-children@npm:~5.1.2":
+  version: 5.1.2
+  resolution: "react-keyed-flatten-children@npm:5.1.2"
   peerDependencies:
-    react: ">=15.0.0"
-  checksum: 10/58b53ccc707543b3b2f3615a6efe890b1302bf38d68df9239cb4d1ca4e8d8d9c05d670039c08e77befd27b1210c61290d6308a2f8439363e6699fecb94b69ebd
+    react: ">=18.0.0"
+    react-is: ">=18.0.0"
+  checksum: 10/b8aa894d87d129fc2cfec5fec490d1f21b8c7800149b7e91c004df7b31ce9e2c24370acc42f970a24a251e892fecbf231ec9da8fd1a5c2b54b27326d9fa5f9c4
   languageName: node
   linkType: hard
 
@@ -32178,12 +32194,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react@npm:~18.3.1":
-  version: 18.3.1
-  resolution: "react@npm:18.3.1"
-  dependencies:
-    loose-envify: "npm:^1.1.0"
-  checksum: 10/261137d3f3993eaa2368a83110466fc0e558bc2c7f7ae7ca52d94f03aac945f45146bd85e5f481044db1758a1dbb57879e2fcdd33924e2dde1bdc550ce73f7bf
+"react@npm:~19.2.7":
+  version: 19.2.7
+  resolution: "react@npm:19.2.7"
+  checksum: 10/2939997e87d7f0ee0d9d2bb556866b616b999dfb7916283647034eda867a045a39c4f7a736c8ea6beffffcd78397fc30f63a7a3aaf8425b683c3060670859560
   languageName: node
   linkType: hard
 
@@ -33315,15 +33329,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"scheduler@npm:^0.23.2":
-  version: 0.23.2
-  resolution: "scheduler@npm:0.23.2"
-  dependencies:
-    loose-envify: "npm:^1.1.0"
-  checksum: 10/e8d68b89d18d5b028223edf090092846868a765a591944760942b77ea1f69b17235f7e956696efbb62c8130ab90af7e0949bfb8eba7896335507317236966bc9
-  languageName: node
-  linkType: hard
-
 "scheduler@npm:^0.25.0":
   version: 0.25.0
   resolution: "scheduler@npm:0.25.0"
@@ -33331,6 +33336,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"scheduler@npm:^0.27.0":
+  version: 0.27.0
+  resolution: "scheduler@npm:0.27.0"
+  checksum: 10/eab3c3a8373195173e59c147224fc30dabe6dd453f248f5e610e8458512a5a2ee3a06465dc400ebfe6d35c9f5b7f3bb6b2e41c88c86fd177c25a73e7286a1e06
+  languageName: node
+  linkType: hard
+
 "schema-utils@npm:^2.7.0, schema-utils@npm:^2.7.1":
   version: 2.7.1
   resolution: "schema-utils@npm:2.7.1"

From 7a5e3e7546a1a6259a6a89c2c282539b07a853dc Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso.evangelista@rocket.chat>
Date: Mon, 29 Jun 2026 15:26:07 -0300
Subject: [PATCH 3/8] refactor: upgrade Fuselage

---
 .../ABACUpsellModal.spec.tsx.snap             |   4 +-
 .../CreateDiscussion.spec.tsx.snap            |  44 ++--
 .../GenericUpsellModal.spec.tsx.snap          |  20 +-
 .../__snapshots__/UserInfo.spec.tsx.snap      |  16 +-
 .../TimestampPicker.spec.tsx.snap             |  24 +--
 .../AttributesForm.spec.tsx.snap              |  28 +--
 .../DeleteRoomModal.spec.tsx.snap             |   4 +-
 .../PermissionsTable.spec.tsx.snap            |   8 +-
 .../UsersInRoleTable.spec.tsx.snap            |   8 +-
 .../RangeSettingInput.spec.tsx.snap           |  50 ++---
 .../__snapshots__/UsersTable.spec.tsx.snap    |  18 +-
 .../SecurityLogDisplayModal.spec.tsx.snap     |  12 +-
 .../EnterE2EPasswordModal.spec.tsx.snap       |   4 +-
 .../AppLogsFilterCompact.spec.tsx.snap        |   2 +-
 .../AppLogsFilterContextualBar.spec.tsx.snap  |   8 +-
 .../AppLogsFilterExpanded.spec.tsx.snap       |  10 +-
 .../__snapshots__/DateTimeModal.spec.tsx.snap |   4 -
 .../CannedResponseList.spec.tsx.snap          |   5 +-
 .../ForwardChatModal.spec.tsx.snap            |  16 +-
 .../ReturnChatQueueModal.spec.tsx.snap        |   4 +-
 .../__snapshots__/BannedUsers.spec.tsx.snap   |  12 +-
 .../DiscussionsList.spec.tsx.snap             |   8 +-
 .../__snapshots__/RoomFiles.spec.tsx.snap     |  20 +-
 .../__snapshots__/InviteUsers.spec.tsx.snap   |  20 +-
 .../__snapshots__/RoomMembers.spec.tsx.snap   |  36 ++--
 .../FileUploadModal.spec.tsx.snap             |  10 +-
 apps/meteor/package.json                      |  16 +-
 apps/uikit-playground/package.json            |  10 +-
 packages/fuselage-ui-kit/package.json         |   6 +-
 packages/gazzodown/package.json               |   6 +-
 packages/livechat/package.json                |   4 +-
 packages/storybook-config/package.json        |   4 +-
 packages/ui-avatar/package.json               |   4 +-
 packages/ui-client/package.json               |  12 +-
 .../__snapshots__/GenericModal.spec.tsx.snap  |   4 +-
 packages/ui-composer/package.json             |   4 +-
 packages/ui-contexts/package.json             |   4 +-
 packages/ui-video-conf/package.json           |   6 +-
 packages/ui-voip/package.json                 |   6 +-
 .../CallHistoryContextualbar.spec.tsx.snap    |   4 +-
 .../MediaCallWidget.spec.tsx.snap             |   4 +-
 .../PermissionFlowModal.spec.tsx.snap         |  16 +-
 packages/web-ui-registration/package.json     |   6 +-
 yarn.lock                                     | 190 ++++++++----------
 44 files changed, 334 insertions(+), 367 deletions(-)

diff --git a/apps/meteor/client/components/ABAC/ABACUpsellModal/__snapshots__/ABACUpsellModal.spec.tsx.snap b/apps/meteor/client/components/ABAC/ABACUpsellModal/__snapshots__/ABACUpsellModal.spec.tsx.snap
index 3d544cb7d96a3..0dce937dd6791 100644
--- a/apps/meteor/client/components/ABAC/ABACUpsellModal/__snapshots__/ABACUpsellModal.spec.tsx.snap
+++ b/apps/meteor/client/components/ABAC/ABACUpsellModal/__snapshots__/ABACUpsellModal.spec.tsx.snap
@@ -4,7 +4,7 @@ exports[`ABACUpsellModal should render the modal with correct content 1`] = `
 <body>
   <div>
     <dialog
-      aria-labelledby=":r0:-title"
+      aria-labelledby="_r_0_-title"
       aria-modal="true"
       class="rcx-box rcx-box--full rcx-modal"
       open=""
@@ -28,7 +28,7 @@ exports[`ABACUpsellModal should render the modal with correct content 1`] = `
               </div>
               <h2
                 class="rcx-box rcx-box--full rcx-modal__title"
-                id=":r0:-title"
+                id="_r_0_-title"
               >
                 Attribute-Based Access Control
               </h2>
diff --git a/apps/meteor/client/components/CreateDiscussion/__snapshots__/CreateDiscussion.spec.tsx.snap b/apps/meteor/client/components/CreateDiscussion/__snapshots__/CreateDiscussion.spec.tsx.snap
index 915ce0fc0ed33..46c6c43304368 100644
--- a/apps/meteor/client/components/CreateDiscussion/__snapshots__/CreateDiscussion.spec.tsx.snap
+++ b/apps/meteor/client/components/CreateDiscussion/__snapshots__/CreateDiscussion.spec.tsx.snap
@@ -4,7 +4,7 @@ exports[`CreateDiscussion renders Default without crashing 1`] = `
 <body>
   <div>
     <dialog
-      aria-labelledby=":r0:-title"
+      aria-labelledby="_r_0_-title"
       aria-modal="true"
       class="rcx-box rcx-box--full rcx-modal"
       open=""
@@ -23,7 +23,7 @@ exports[`CreateDiscussion renders Default without crashing 1`] = `
             >
               <h2
                 class="rcx-box rcx-box--full rcx-modal__title"
-                id=":r0:-title"
+                id="_r_0_-title"
               >
                 Discussion_title
               </h2>
@@ -63,7 +63,7 @@ exports[`CreateDiscussion renders Default without crashing 1`] = `
               >
                 <span
                   class="rcx-box rcx-box--full rcx-field__label rcx-label"
-                  id="react-aria-:r1:-label"
+                  id="react-aria-_r_1_-label"
                 >
                   Parent channel or team
                   <span
@@ -86,10 +86,10 @@ exports[`CreateDiscussion renders Default without crashing 1`] = `
                       <input
                         aria-describedby=""
                         aria-invalid="false"
-                        aria-labelledby="react-aria-:r1:-label"
+                        aria-labelledby="react-aria-_r_1_-label"
                         aria-required="true"
                         class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--undecorated rcx-input-box rcx-css-trljwa rcx-css-rcil7k"
-                        id="react-aria-:r1:"
+                        id="react-aria-_r_1_"
                         name="parentRoom"
                         placeholder="Search_options"
                         value=""
@@ -113,7 +113,7 @@ exports[`CreateDiscussion renders Default without crashing 1`] = `
               >
                 <label
                   class="rcx-box rcx-box--full rcx-field__label rcx-label"
-                  for="react-aria-:r2:-label"
+                  for="react-aria-_r_2_-label"
                 >
                   Name
                   <span
@@ -134,7 +134,7 @@ exports[`CreateDiscussion renders Default without crashing 1`] = `
                       aria-invalid="false"
                       aria-required="true"
                       class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--undecorated rcx-input-box--type-text rcx-input-box"
-                      id="react-aria-:r2:-label"
+                      id="react-aria-_r_2_-label"
                       name="name"
                       size="1"
                       type="text"
@@ -158,7 +158,7 @@ exports[`CreateDiscussion renders Default without crashing 1`] = `
               >
                 <label
                   class="rcx-box rcx-box--full rcx-field__label rcx-label"
-                  for="react-aria-:r3:-label"
+                  for="react-aria-_r_3_-label"
                 >
                   Topic
                 </label>
@@ -166,10 +166,10 @@ exports[`CreateDiscussion renders Default without crashing 1`] = `
                   class="rcx-box rcx-box--full rcx-field__row"
                 >
                   <input
-                    aria-describedby="react-aria-:r3:-hint"
+                    aria-describedby="react-aria-_r_3_-hint"
                     aria-invalid="false"
                     class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--type-text rcx-input-box"
-                    id="react-aria-:r3:-label"
+                    id="react-aria-_r_3_-label"
                     name="topic"
                     size="1"
                     type="text"
@@ -181,7 +181,7 @@ exports[`CreateDiscussion renders Default without crashing 1`] = `
                 >
                   <span
                     class="rcx-box rcx-box--full rcx-field__hint"
-                    id="react-aria-:r3:-hint"
+                    id="react-aria-_r_3_-hint"
                   >
                     Displayed_next_to_name
                   </span>
@@ -192,7 +192,7 @@ exports[`CreateDiscussion renders Default without crashing 1`] = `
               >
                 <span
                   class="rcx-box rcx-box--full rcx-field__label rcx-label"
-                  id="react-aria-:r4:-label"
+                  id="react-aria-_r_4_-label"
                 >
                   Members
                 </span>
@@ -209,15 +209,15 @@ exports[`CreateDiscussion renders Default without crashing 1`] = `
                         class="rcx-box rcx-box--full rcx-css-w398ts"
                       >
                         <input
-                          aria-controls="react-aria-:r4:-listbox"
+                          aria-controls="react-aria-_r_4_-listbox"
                           aria-describedby=""
                           aria-expanded="false"
                           aria-haspopup="listbox"
                           aria-invalid="false"
-                          aria-labelledby="react-aria-:r4:-label"
+                          aria-labelledby="react-aria-_r_4_-label"
                           autocomplete="off"
                           class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--undecorated rcx-input-box rcx-css-trljwa rcx-css-pqpp8q"
-                          id="react-aria-:r4:"
+                          id="react-aria-_r_4_"
                           name="usernames"
                           placeholder="Add_people"
                           role="combobox"
@@ -243,7 +243,7 @@ exports[`CreateDiscussion renders Default without crashing 1`] = `
               >
                 <label
                   class="rcx-box rcx-box--full rcx-field__label rcx-label"
-                  for="react-aria-:r5:-label"
+                  for="react-aria-_r_5_-label"
                 >
                   Message
                 </label>
@@ -251,11 +251,11 @@ exports[`CreateDiscussion renders Default without crashing 1`] = `
                   class="rcx-box rcx-box--full rcx-field__row"
                 >
                   <textarea
-                    aria-describedby="react-aria-:r5:-hint"
+                    aria-describedby="react-aria-_r_5_-hint"
                     aria-invalid="false"
                     class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--type-textarea rcx-input-box"
                     cols="1"
-                    id="react-aria-:r5:-label"
+                    id="react-aria-_r_5_-label"
                     name="firstMessage"
                     rows="5"
                     size="1"
@@ -263,7 +263,7 @@ exports[`CreateDiscussion renders Default without crashing 1`] = `
                 </span>
                 <span
                   class="rcx-box rcx-box--full rcx-field__hint"
-                  id="react-aria-:r5:-hint"
+                  id="react-aria-_r_5_-hint"
                 >
                   First_message_hint
                 </span>
@@ -288,10 +288,10 @@ exports[`CreateDiscussion renders Default without crashing 1`] = `
                       Encrypted
                     </div>
                     <input
-                      aria-describedby="react-aria-:r6:-hint"
+                      aria-describedby="react-aria-_r_6_-hint"
                       aria-invalid="false"
                       class="rcx-box rcx-box--full rcx-toggle-switch__input"
-                      id="react-aria-:r6:-label"
+                      id="react-aria-_r_6_-label"
                       name="encrypted"
                       type="checkbox"
                     />
@@ -303,7 +303,7 @@ exports[`CreateDiscussion renders Default without crashing 1`] = `
                 </span>
                 <span
                   class="rcx-box rcx-box--full rcx-field__hint"
-                  id="react-aria-:r6:-hint"
+                  id="react-aria-_r_6_-hint"
                 >
                   Not_available_for_this_workspace
                 </span>
diff --git a/apps/meteor/client/components/GenericUpsellModal/__snapshots__/GenericUpsellModal.spec.tsx.snap b/apps/meteor/client/components/GenericUpsellModal/__snapshots__/GenericUpsellModal.spec.tsx.snap
index 5344392b04317..3f3d7f1c7e078 100644
--- a/apps/meteor/client/components/GenericUpsellModal/__snapshots__/GenericUpsellModal.spec.tsx.snap
+++ b/apps/meteor/client/components/GenericUpsellModal/__snapshots__/GenericUpsellModal.spec.tsx.snap
@@ -4,7 +4,7 @@ exports[`GenericUpsellModal renders Default without crashing 1`] = `
 <body>
   <div>
     <dialog
-      aria-labelledby=":r0:-title"
+      aria-labelledby="_r_0_-title"
       aria-modal="true"
       class="rcx-box rcx-box--full rcx-modal"
       open=""
@@ -28,7 +28,7 @@ exports[`GenericUpsellModal renders Default without crashing 1`] = `
               </div>
               <h2
                 class="rcx-box rcx-box--full rcx-modal__title"
-                id=":r0:-title"
+                id="_r_0_-title"
               >
                 This is the title
               </h2>
@@ -115,7 +115,7 @@ exports[`GenericUpsellModal renders WithAnnotation without crashing 1`] = `
 <body>
   <div>
     <dialog
-      aria-labelledby=":r1:-title"
+      aria-labelledby="_r_1_-title"
       aria-modal="true"
       class="rcx-box rcx-box--full rcx-modal"
       open=""
@@ -139,7 +139,7 @@ exports[`GenericUpsellModal renders WithAnnotation without crashing 1`] = `
               </div>
               <h2
                 class="rcx-box rcx-box--full rcx-modal__title"
-                id=":r1:-title"
+                id="_r_1_-title"
               >
                 This is the title
               </h2>
@@ -231,7 +231,7 @@ exports[`GenericUpsellModal renders WithCustomButtons without crashing 1`] = `
 <body>
   <div>
     <dialog
-      aria-labelledby=":r2:-title"
+      aria-labelledby="_r_2_-title"
       aria-modal="true"
       class="rcx-box rcx-box--full rcx-modal"
       open=""
@@ -255,7 +255,7 @@ exports[`GenericUpsellModal renders WithCustomButtons without crashing 1`] = `
               </div>
               <h2
                 class="rcx-box rcx-box--full rcx-modal__title"
-                id=":r2:-title"
+                id="_r_2_-title"
               >
                 This is the title
               </h2>
@@ -342,7 +342,7 @@ exports[`GenericUpsellModal renders WithCustomTagLine without crashing 1`] = `
 <body>
   <div>
     <dialog
-      aria-labelledby=":r3:-title"
+      aria-labelledby="_r_3_-title"
       aria-modal="true"
       class="rcx-box rcx-box--full rcx-modal"
       open=""
@@ -366,7 +366,7 @@ exports[`GenericUpsellModal renders WithCustomTagLine without crashing 1`] = `
               </div>
               <h2
                 class="rcx-box rcx-box--full rcx-modal__title"
-                id=":r3:-title"
+                id="_r_3_-title"
               >
                 This is the title
               </h2>
@@ -453,7 +453,7 @@ exports[`GenericUpsellModal renders WithFixedWidthAndHeight without crashing 1`]
 <body>
   <div>
     <dialog
-      aria-labelledby=":r4:-title"
+      aria-labelledby="_r_4_-title"
       aria-modal="true"
       class="rcx-box rcx-box--full rcx-modal"
       open=""
@@ -477,7 +477,7 @@ exports[`GenericUpsellModal renders WithFixedWidthAndHeight without crashing 1`]
               </div>
               <h2
                 class="rcx-box rcx-box--full rcx-modal__title"
-                id=":r4:-title"
+                id="_r_4_-title"
               >
                 This is the title
               </h2>
diff --git a/apps/meteor/client/components/UserInfo/__snapshots__/UserInfo.spec.tsx.snap b/apps/meteor/client/components/UserInfo/__snapshots__/UserInfo.spec.tsx.snap
index 09d900532be03..9dc5cd657db1a 100644
--- a/apps/meteor/client/components/UserInfo/__snapshots__/UserInfo.spec.tsx.snap
+++ b/apps/meteor/client/components/UserInfo/__snapshots__/UserInfo.spec.tsx.snap
@@ -170,12 +170,12 @@ exports[`renders Default without crashing 1`] = `
                     >
                       <dt
                         class="rcx-box rcx-box--full rcx-css-1n8o8rn"
-                        id=":r1:"
+                        id="_r_1_"
                       >
                         Username
                       </dt>
                       <dd
-                        aria-labelledby=":r1:"
+                        aria-labelledby="_r_1_"
                         class="rcx-box rcx-box--full rcx-css-6hwe8l rcx-css-faoni4"
                       >
                         guilherme.gazzo
@@ -467,12 +467,12 @@ exports[`renders InvitedUser without crashing 1`] = `
                     >
                       <dt
                         class="rcx-box rcx-box--full rcx-css-1n8o8rn"
-                        id=":r3:"
+                        id="_r_3_"
                       >
                         Username
                       </dt>
                       <dd
-                        aria-labelledby=":r3:"
+                        aria-labelledby="_r_3_"
                         class="rcx-box rcx-box--full rcx-css-6hwe8l rcx-css-faoni4"
                       >
                         guilherme.gazzo
@@ -778,12 +778,12 @@ exports[`renders WithABACAttributes without crashing 1`] = `
                     >
                       <dt
                         class="rcx-box rcx-box--full rcx-css-1n8o8rn"
-                        id=":r5:"
+                        id="_r_5_"
                       >
                         Username
                       </dt>
                       <dd
-                        aria-labelledby=":r5:"
+                        aria-labelledby="_r_5_"
                         class="rcx-box rcx-box--full rcx-css-6hwe8l rcx-css-faoni4"
                       >
                         guilherme.gazzo
@@ -1135,12 +1135,12 @@ exports[`renders WithVoiceCallExtension without crashing 1`] = `
                     >
                       <dt
                         class="rcx-box rcx-box--full rcx-css-1n8o8rn"
-                        id=":r7:"
+                        id="_r_7_"
                       >
                         Username
                       </dt>
                       <dd
-                        aria-labelledby=":r7:"
+                        aria-labelledby="_r_7_"
                         class="rcx-box rcx-box--full rcx-css-6hwe8l rcx-css-faoni4"
                       >
                         guilherme.gazzo
diff --git a/apps/meteor/client/components/message/toolbar/items/actions/Timestamp/TimestampPicker/__snapshots__/TimestampPicker.spec.tsx.snap b/apps/meteor/client/components/message/toolbar/items/actions/Timestamp/TimestampPicker/__snapshots__/TimestampPicker.spec.tsx.snap
index 433706e37a582..bca9029493017 100644
--- a/apps/meteor/client/components/message/toolbar/items/actions/Timestamp/TimestampPicker/__snapshots__/TimestampPicker.spec.tsx.snap
+++ b/apps/meteor/client/components/message/toolbar/items/actions/Timestamp/TimestampPicker/__snapshots__/TimestampPicker.spec.tsx.snap
@@ -11,7 +11,7 @@ exports[`Story Tests renders DatePickerDefault without crashing 1`] = `
       >
         <label
           class="rcx-box rcx-box--full rcx-field__label rcx-label"
-          for=":r0:"
+          for="_r_0_"
         >
           Date
         </label>
@@ -23,7 +23,7 @@ exports[`Story Tests renders DatePickerDefault without crashing 1`] = `
           >
             <input
               class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--undecorated rcx-input-box--type-date rcx-input-box"
-              id=":r0:"
+              id="_r_0_"
               size="1"
               type="date"
               value="2025-07-25"
@@ -50,7 +50,7 @@ exports[`Story Tests renders Default without crashing 1`] = `
 <body>
   <div>
     <dialog
-      aria-labelledby=":r1:-title"
+      aria-labelledby="_r_1_-title"
       aria-modal="true"
       class="rcx-box rcx-box--full rcx-modal"
       open=""
@@ -69,7 +69,7 @@ exports[`Story Tests renders Default without crashing 1`] = `
             >
               <h2
                 class="rcx-box rcx-box--full rcx-modal__title"
-                id=":r1:-title"
+                id="_r_1_-title"
               >
                 Insert_timestamp
               </h2>
@@ -128,7 +128,7 @@ exports[`Story Tests renders Default without crashing 1`] = `
                 >
                   <label
                     class="rcx-box rcx-box--full rcx-field__label rcx-label"
-                    for=":r2:"
+                    for="_r_2_"
                   >
                     Date
                   </label>
@@ -140,7 +140,7 @@ exports[`Story Tests renders Default without crashing 1`] = `
                     >
                       <input
                         class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--undecorated rcx-input-box--type-date rcx-input-box"
-                        id=":r2:"
+                        id="_r_2_"
                         size="1"
                         type="date"
                         value="2025-01-01"
@@ -167,7 +167,7 @@ exports[`Story Tests renders Default without crashing 1`] = `
                 >
                   <label
                     class="rcx-box rcx-box--full rcx-field__label rcx-label"
-                    for=":r3:"
+                    for="_r_3_"
                   >
                     Time
                   </label>
@@ -179,7 +179,7 @@ exports[`Story Tests renders Default without crashing 1`] = `
                     >
                       <input
                         class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--undecorated rcx-input-box--type-time rcx-input-box"
-                        id=":r3:"
+                        id="_r_3_"
                         size="1"
                         type="time"
                         value="12:00"
@@ -269,13 +269,13 @@ exports[`Story Tests renders Default without crashing 1`] = `
                     <button
                       aria-expanded="false"
                       aria-haspopup="listbox"
-                      aria-labelledby="react-aria-:rb:"
+                      aria-labelledby="react-aria-_r_b_"
                       class="rcx-box rcx-box--full rcx-select rcx-css-1vw6rc6"
                       type="button"
                     >
                       <span
                         class="rcx-box rcx-box--full rcx-css-e3nij6"
-                        id="react-aria-:rb:"
+                        id="react-aria-_r_b_"
                       >
                         timestamps.fullDateTime (timestamps.fullDateTimeDescription)
                       </span>
@@ -460,13 +460,13 @@ exports[`Story Tests renders Default without crashing 1`] = `
                     <button
                       aria-expanded="false"
                       aria-haspopup="listbox"
-                      aria-labelledby="react-aria-:rj:"
+                      aria-labelledby="react-aria-_r_j_"
                       class="rcx-box rcx-box--full rcx-select rcx-css-1vw6rc6"
                       type="button"
                     >
                       <span
                         class="rcx-box rcx-box--full rcx-css-e3nij6"
-                        id="react-aria-:rj:"
+                        id="react-aria-_r_j_"
                       >
                         Local_Time
                       </span>
diff --git a/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/__snapshots__/AttributesForm.spec.tsx.snap b/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/__snapshots__/AttributesForm.spec.tsx.snap
index df304a6a2d272..fadae43845925 100644
--- a/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/__snapshots__/AttributesForm.spec.tsx.snap
+++ b/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/__snapshots__/AttributesForm.spec.tsx.snap
@@ -28,7 +28,7 @@ exports[`AttributesForm renders NewAttribute without crashing 1`] = `
           >
             <form
               class="rcx-box rcx-box--full rcx-css-zg7o7h"
-              id=":r0:"
+              id="_r_0_"
             >
               <div
                 class="rcx-box rcx-box--full rcx-css-1jggbrp rcx-css-1fuhgt0"
@@ -40,7 +40,7 @@ exports[`AttributesForm renders NewAttribute without crashing 1`] = `
               >
                 <label
                   class="rcx-box rcx-box--full rcx-field__label rcx-label"
-                  for=":r1:"
+                  for="_r_1_"
                 >
                   Name
                   <span
@@ -57,7 +57,7 @@ exports[`AttributesForm renders NewAttribute without crashing 1`] = `
                     aria-invalid="false"
                     aria-required="true"
                     class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--type-text rcx-input-box"
-                    id=":r1:"
+                    id="_r_1_"
                     name="name"
                     size="1"
                     type="text"
@@ -69,7 +69,7 @@ exports[`AttributesForm renders NewAttribute without crashing 1`] = `
               >
                 <label
                   class="rcx-box rcx-box--full rcx-field__label rcx-label"
-                  id=":r2:"
+                  id="_r_2_"
                 >
                   Values
                   <span
@@ -84,7 +84,7 @@ exports[`AttributesForm renders NewAttribute without crashing 1`] = `
                 >
                   <input
                     aria-invalid="false"
-                    aria-labelledby=":r2:"
+                    aria-labelledby="_r_2_"
                     aria-required="true"
                     class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--type-text rcx-input-box"
                     name="attributeValues.0.value"
@@ -152,7 +152,7 @@ exports[`AttributesForm renders NewAttribute without crashing 1`] = `
           <button
             class="rcx-box rcx-box--full rcx-button--primary rcx-button"
             disabled=""
-            form=":r0:"
+            form="_r_0_"
             type="submit"
           >
             <span
@@ -196,7 +196,7 @@ exports[`AttributesForm renders WithLockedAttributes without crashing 1`] = `
           >
             <form
               class="rcx-box rcx-box--full rcx-css-zg7o7h"
-              id=":r3:"
+              id="_r_3_"
             >
               <div
                 class="rcx-box rcx-box--full rcx-css-1jggbrp rcx-css-1fuhgt0"
@@ -208,7 +208,7 @@ exports[`AttributesForm renders WithLockedAttributes without crashing 1`] = `
               >
                 <label
                   class="rcx-box rcx-box--full rcx-field__label rcx-label"
-                  for=":r4:"
+                  for="_r_4_"
                 >
                   Name
                   <span
@@ -225,7 +225,7 @@ exports[`AttributesForm renders WithLockedAttributes without crashing 1`] = `
                     aria-invalid="false"
                     aria-required="true"
                     class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--type-text rcx-input-box"
-                    id=":r4:"
+                    id="_r_4_"
                     name="name"
                     size="1"
                     type="text"
@@ -237,7 +237,7 @@ exports[`AttributesForm renders WithLockedAttributes without crashing 1`] = `
               >
                 <label
                   class="rcx-box rcx-box--full rcx-field__label rcx-label"
-                  id=":r5:"
+                  id="_r_5_"
                 >
                   Values
                   <span
@@ -252,7 +252,7 @@ exports[`AttributesForm renders WithLockedAttributes without crashing 1`] = `
                 >
                   <input
                     aria-invalid="false"
-                    aria-labelledby=":r5:"
+                    aria-labelledby="_r_5_"
                     aria-required="true"
                     class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--type-text rcx-input-box"
                     disabled=""
@@ -266,7 +266,7 @@ exports[`AttributesForm renders WithLockedAttributes without crashing 1`] = `
                 >
                   <input
                     aria-invalid="false"
-                    aria-labelledby=":r5:"
+                    aria-labelledby="_r_5_"
                     aria-required="true"
                     class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--type-text rcx-input-box"
                     disabled=""
@@ -292,7 +292,7 @@ exports[`AttributesForm renders WithLockedAttributes without crashing 1`] = `
                 >
                   <input
                     aria-invalid="false"
-                    aria-labelledby=":r5:"
+                    aria-labelledby="_r_5_"
                     aria-required="true"
                     class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--type-text rcx-input-box"
                     disabled=""
@@ -372,7 +372,7 @@ exports[`AttributesForm renders WithLockedAttributes without crashing 1`] = `
           <button
             class="rcx-box rcx-box--full rcx-button--primary rcx-button"
             disabled=""
-            form=":r3:"
+            form="_r_3_"
             type="submit"
           >
             <span
diff --git a/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/__snapshots__/DeleteRoomModal.spec.tsx.snap b/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/__snapshots__/DeleteRoomModal.spec.tsx.snap
index 86444ff598207..8c674534f041e 100644
--- a/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/__snapshots__/DeleteRoomModal.spec.tsx.snap
+++ b/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/__snapshots__/DeleteRoomModal.spec.tsx.snap
@@ -4,7 +4,7 @@ exports[`DeleteRoomModal should render without crashing 1`] = `
 <body>
   <div>
     <dialog
-      aria-labelledby=":r0:-title"
+      aria-labelledby="_r_0_-title"
       aria-modal="true"
       class="rcx-box rcx-box--full rcx-modal"
       open=""
@@ -23,7 +23,7 @@ exports[`DeleteRoomModal should render without crashing 1`] = `
             >
               <h2
                 class="rcx-box rcx-box--full rcx-modal__title"
-                id=":r0:-title"
+                id="_r_0_-title"
               >
                 Remove room from ABAC management
               </h2>
diff --git a/apps/meteor/client/views/admin/permissions/PermissionsTable/__snapshots__/PermissionsTable.spec.tsx.snap b/apps/meteor/client/views/admin/permissions/PermissionsTable/__snapshots__/PermissionsTable.spec.tsx.snap
index dceef66908f49..687c597425e42 100644
--- a/apps/meteor/client/views/admin/permissions/PermissionsTable/__snapshots__/PermissionsTable.spec.tsx.snap
+++ b/apps/meteor/client/views/admin/permissions/PermissionsTable/__snapshots__/PermissionsTable.spec.tsx.snap
@@ -1069,12 +1069,12 @@ exports[`renders Default without crashing 1`] = `
         >
           <span
             class="rcx-pagination__label"
-            id=":r1:"
+            id="_r_1_"
           >
             Items per page:
           </span>
           <ol
-            aria-labelledby=":r1:"
+            aria-labelledby="_r_1_"
             class="rcx-box rcx-box--full rcx-pagination__list"
           >
             <li
@@ -1118,12 +1118,12 @@ exports[`renders Default without crashing 1`] = `
         >
           <span
             class="rcx-pagination__label"
-            id=":r0:"
+            id="_r_0_"
           >
             Showing results 1 - 4 of 10
           </span>
           <ol
-            aria-labelledby=":r0:"
+            aria-labelledby="_r_0_"
             class="rcx-box rcx-box--full rcx-pagination__list"
           >
             <li
diff --git a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/__snapshots__/UsersInRoleTable.spec.tsx.snap b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/__snapshots__/UsersInRoleTable.spec.tsx.snap
index ef1a6ed80481e..5c8aa960e784c 100644
--- a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/__snapshots__/UsersInRoleTable.spec.tsx.snap
+++ b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/__snapshots__/UsersInRoleTable.spec.tsx.snap
@@ -417,12 +417,12 @@ exports[`renders Default without crashing 1`] = `
         >
           <span
             class="rcx-pagination__label"
-            id=":r1:"
+            id="_r_1_"
           >
             Items per page:
           </span>
           <ol
-            aria-labelledby=":r1:"
+            aria-labelledby="_r_1_"
             class="rcx-box rcx-box--full rcx-pagination__list"
           >
             <li
@@ -466,12 +466,12 @@ exports[`renders Default without crashing 1`] = `
         >
           <span
             class="rcx-pagination__label"
-            id=":r0:"
+            id="_r_0_"
           >
             Showing results 1 - 5 of 30
           </span>
           <ol
-            aria-labelledby=":r0:"
+            aria-labelledby="_r_0_"
             class="rcx-box rcx-box--full rcx-pagination__list"
           >
             <li
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/__snapshots__/RangeSettingInput.spec.tsx.snap b/apps/meteor/client/views/admin/settings/Setting/inputs/__snapshots__/RangeSettingInput.spec.tsx.snap
index 27a32bcb542a1..1f979801b2230 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/__snapshots__/RangeSettingInput.spec.tsx.snap
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/__snapshots__/RangeSettingInput.spec.tsx.snap
@@ -25,19 +25,19 @@ exports[`renders Default without crashing 1`] = `
         >
           <div
             class="rcx-css-146twpt"
-            id="react-aria-:r0:"
+            id="react-aria-_r_0_"
             role="group"
           >
             <label
               aria-live="off"
               class="rcx-box rcx-box--full rcx-label"
-              for="react-aria-:r0:-0"
+              for="react-aria-_r_0_-0"
             >
               <span
                 aria-live="off"
                 class="rcx-box rcx-box--full rcx-label"
                 data-testid="slider-output"
-                for="react-aria-:r0:-0"
+                for="react-aria-_r_0_-0"
               >
                 0
               </span>
@@ -56,10 +56,10 @@ exports[`renders Default without crashing 1`] = `
                   <input
                     aria-describedby=""
                     aria-details=""
-                    aria-labelledby="react-aria-:r0:"
+                    aria-labelledby="react-aria-_r_0_"
                     aria-orientation="horizontal"
                     aria-valuetext="0"
-                    id="react-aria-:r0:-0"
+                    id="react-aria-_r_0_-0"
                     max="100"
                     min="0"
                     step="1"
@@ -103,19 +103,19 @@ exports[`renders Disabled without crashing 1`] = `
         >
           <div
             class="rcx-css-146twpt"
-            id="react-aria-:r6:"
+            id="react-aria-_r_6_"
             role="group"
           >
             <label
               aria-live="off"
               class="rcx-box rcx-box--full rcx-label"
-              for="react-aria-:r6:-0"
+              for="react-aria-_r_6_-0"
             >
               <span
                 aria-live="off"
                 class="rcx-box rcx-box--full rcx-label"
                 data-testid="slider-output"
-                for="react-aria-:r6:-0"
+                for="react-aria-_r_6_-0"
               >
                 0
               </span>
@@ -134,11 +134,11 @@ exports[`renders Disabled without crashing 1`] = `
                   <input
                     aria-describedby=""
                     aria-details=""
-                    aria-labelledby="react-aria-:r6:"
+                    aria-labelledby="react-aria-_r_6_"
                     aria-orientation="horizontal"
                     aria-valuetext="0"
                     disabled=""
-                    id="react-aria-:r6:-0"
+                    id="react-aria-_r_6_-0"
                     max="100"
                     min="0"
                     step="1"
@@ -190,19 +190,19 @@ exports[`renders WithHint without crashing 1`] = `
         >
           <div
             class="rcx-css-146twpt"
-            id="react-aria-:rc:"
+            id="react-aria-_r_c_"
             role="group"
           >
             <label
               aria-live="off"
               class="rcx-box rcx-box--full rcx-label"
-              for="react-aria-:rc:-0"
+              for="react-aria-_r_c_-0"
             >
               <span
                 aria-live="off"
                 class="rcx-box rcx-box--full rcx-label"
                 data-testid="slider-output"
-                for="react-aria-:rc:-0"
+                for="react-aria-_r_c_-0"
               >
                 50
               </span>
@@ -221,10 +221,10 @@ exports[`renders WithHint without crashing 1`] = `
                   <input
                     aria-describedby=""
                     aria-details=""
-                    aria-labelledby="react-aria-:rc:"
+                    aria-labelledby="react-aria-_r_c_"
                     aria-orientation="horizontal"
                     aria-valuetext="50"
-                    id="react-aria-:rc:-0"
+                    id="react-aria-_r_c_-0"
                     max="100"
                     min="0"
                     step="1"
@@ -280,19 +280,19 @@ exports[`renders WithResetButton without crashing 1`] = `
         >
           <div
             class="rcx-css-146twpt"
-            id="react-aria-:ri:"
+            id="react-aria-_r_i_"
             role="group"
           >
             <label
               aria-live="off"
               class="rcx-box rcx-box--full rcx-label"
-              for="react-aria-:ri:-0"
+              for="react-aria-_r_i_-0"
             >
               <span
                 aria-live="off"
                 class="rcx-box rcx-box--full rcx-label"
                 data-testid="slider-output"
-                for="react-aria-:ri:-0"
+                for="react-aria-_r_i_-0"
               >
                 50
               </span>
@@ -311,10 +311,10 @@ exports[`renders WithResetButton without crashing 1`] = `
                   <input
                     aria-describedby=""
                     aria-details=""
-                    aria-labelledby="react-aria-:ri:"
+                    aria-labelledby="react-aria-_r_i_"
                     aria-orientation="horizontal"
                     aria-valuetext="50"
-                    id="react-aria-:ri:-0"
+                    id="react-aria-_r_i_-0"
                     max="100"
                     min="0"
                     step="1"
@@ -358,19 +358,19 @@ exports[`renders WithValue without crashing 1`] = `
         >
           <div
             class="rcx-css-146twpt"
-            id="react-aria-:ro:"
+            id="react-aria-_r_o_"
             role="group"
           >
             <label
               aria-live="off"
               class="rcx-box rcx-box--full rcx-label"
-              for="react-aria-:ro:-0"
+              for="react-aria-_r_o_-0"
             >
               <span
                 aria-live="off"
                 class="rcx-box rcx-box--full rcx-label"
                 data-testid="slider-output"
-                for="react-aria-:ro:-0"
+                for="react-aria-_r_o_-0"
               >
                 50
               </span>
@@ -389,10 +389,10 @@ exports[`renders WithValue without crashing 1`] = `
                   <input
                     aria-describedby=""
                     aria-details=""
-                    aria-labelledby="react-aria-:ro:"
+                    aria-labelledby="react-aria-_r_o_"
                     aria-orientation="horizontal"
                     aria-valuetext="50"
-                    id="react-aria-:ro:-0"
+                    id="react-aria-_r_o_-0"
                     max="100"
                     min="0"
                     step="1"
diff --git a/apps/meteor/client/views/admin/users/UsersTable/__snapshots__/UsersTable.spec.tsx.snap b/apps/meteor/client/views/admin/users/UsersTable/__snapshots__/UsersTable.spec.tsx.snap
index 7eb6c2b7fdbc3..24ddd47b7b737 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/__snapshots__/UsersTable.spec.tsx.snap
+++ b/apps/meteor/client/views/admin/users/UsersTable/__snapshots__/UsersTable.spec.tsx.snap
@@ -230,7 +230,7 @@ exports[`renders Default without crashing 1`] = `
                         aria-haspopup="true"
                         aria-label="More_actions"
                         class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
-                        id="react-aria-:r0:"
+                        id="react-aria-_r_0_"
                         title="More_actions"
                         type="button"
                       >
@@ -320,7 +320,7 @@ exports[`renders Default without crashing 1`] = `
                         aria-haspopup="true"
                         aria-label="More_actions"
                         class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
-                        id="react-aria-:r2:"
+                        id="react-aria-_r_2_"
                         title="More_actions"
                         type="button"
                       >
@@ -407,7 +407,7 @@ exports[`renders Default without crashing 1`] = `
                         aria-haspopup="true"
                         aria-label="More_actions"
                         class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
-                        id="react-aria-:r4:"
+                        id="react-aria-_r_4_"
                         title="More_actions"
                         type="button"
                       >
@@ -494,7 +494,7 @@ exports[`renders Default without crashing 1`] = `
                         aria-haspopup="true"
                         aria-label="More_actions"
                         class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
-                        id="react-aria-:r6:"
+                        id="react-aria-_r_6_"
                         title="More_actions"
                         type="button"
                       >
@@ -579,7 +579,7 @@ exports[`renders Default without crashing 1`] = `
                         aria-haspopup="true"
                         aria-label="More_actions"
                         class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
-                        id="react-aria-:r8:"
+                        id="react-aria-_r_8_"
                         title="More_actions"
                         type="button"
                       >
@@ -632,12 +632,12 @@ exports[`renders Default without crashing 1`] = `
       >
         <span
           class="rcx-pagination__label"
-          id=":rb:"
+          id="_r_b_"
         >
           Items per page:
         </span>
         <ol
-          aria-labelledby=":rb:"
+          aria-labelledby="_r_b_"
           class="rcx-box rcx-box--full rcx-pagination__list"
         >
           <li
@@ -681,12 +681,12 @@ exports[`renders Default without crashing 1`] = `
       >
         <span
           class="rcx-pagination__label"
-          id=":ra:"
+          id="_r_a_"
         >
           Showing results 1 - 5 of 5
         </span>
         <ol
-          aria-labelledby=":ra:"
+          aria-labelledby="_r_a_"
           class="rcx-box rcx-box--full rcx-pagination__list"
         >
           <li
diff --git a/apps/meteor/client/views/audit/components/__snapshots__/SecurityLogDisplayModal.spec.tsx.snap b/apps/meteor/client/views/audit/components/__snapshots__/SecurityLogDisplayModal.spec.tsx.snap
index caeb092cd80ce..8525ca40c2004 100644
--- a/apps/meteor/client/views/audit/components/__snapshots__/SecurityLogDisplayModal.spec.tsx.snap
+++ b/apps/meteor/client/views/audit/components/__snapshots__/SecurityLogDisplayModal.spec.tsx.snap
@@ -4,7 +4,7 @@ exports[`renders Default without crashing 1`] = `
 <body>
   <div>
     <dialog
-      aria-labelledby=":r0:-title"
+      aria-labelledby="_r_0_-title"
       aria-modal="true"
       class="rcx-box rcx-box--full rcx-modal rcx-css-9ju0e2"
       open=""
@@ -23,7 +23,7 @@ exports[`renders Default without crashing 1`] = `
             >
               <h2
                 class="rcx-box rcx-box--full rcx-modal__title"
-                id=":r0:-title"
+                id="_r_0_-title"
               >
                 Setting_change
               </h2>
@@ -140,7 +140,7 @@ exports[`renders app without crashing 1`] = `
 <body>
   <div>
     <dialog
-      aria-labelledby=":r1:-title"
+      aria-labelledby="_r_1_-title"
       aria-modal="true"
       class="rcx-box rcx-box--full rcx-modal rcx-css-9ju0e2"
       open=""
@@ -159,7 +159,7 @@ exports[`renders app without crashing 1`] = `
             >
               <h2
                 class="rcx-box rcx-box--full rcx-modal__title"
-                id=":r1:-title"
+                id="_r_1_-title"
               >
                 Setting_change
               </h2>
@@ -279,7 +279,7 @@ exports[`renders system without crashing 1`] = `
 <body>
   <div>
     <dialog
-      aria-labelledby=":r2:-title"
+      aria-labelledby="_r_2_-title"
       aria-modal="true"
       class="rcx-box rcx-box--full rcx-modal rcx-css-9ju0e2"
       open=""
@@ -298,7 +298,7 @@ exports[`renders system without crashing 1`] = `
             >
               <h2
                 class="rcx-box rcx-box--full rcx-modal__title"
-                id=":r2:-title"
+                id="_r_2_-title"
               >
                 Setting_change
               </h2>
diff --git a/apps/meteor/client/views/e2e/EnterE2EPasswordModal/__snapshots__/EnterE2EPasswordModal.spec.tsx.snap b/apps/meteor/client/views/e2e/EnterE2EPasswordModal/__snapshots__/EnterE2EPasswordModal.spec.tsx.snap
index 843a22623e8e6..6d1f2a8de3d97 100644
--- a/apps/meteor/client/views/e2e/EnterE2EPasswordModal/__snapshots__/EnterE2EPasswordModal.spec.tsx.snap
+++ b/apps/meteor/client/views/e2e/EnterE2EPasswordModal/__snapshots__/EnterE2EPasswordModal.spec.tsx.snap
@@ -4,7 +4,7 @@ exports[`renders Default without crashing 1`] = `
 <body>
   <div>
     <dialog
-      aria-labelledby=":r1:-title"
+      aria-labelledby="_r_1_-title"
       aria-modal="true"
       class="rcx-box rcx-box--full rcx-modal"
       open=""
@@ -33,7 +33,7 @@ exports[`renders Default without crashing 1`] = `
             >
               <h2
                 class="rcx-box rcx-box--full rcx-modal__title"
-                id=":r1:-title"
+                id="_r_1_-title"
               >
                 Enter_E2E_password
               </h2>
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/AppLogsFilterCompact.spec.tsx.snap b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/AppLogsFilterCompact.spec.tsx.snap
index 874497e97b4a5..50fedae2d1d86 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/AppLogsFilterCompact.spec.tsx.snap
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/AppLogsFilterCompact.spec.tsx.snap
@@ -50,7 +50,7 @@ exports[`renders AppLogsItem without crashing 1`] = `
           aria-haspopup="true"
           aria-label="Options"
           class="rcx-box rcx-box--full rcx-button--large-square rcx-button--square rcx-button--icon rcx-button"
-          id="react-aria-:r0:"
+          id="react-aria-_r_0_"
           title="Options"
           type="button"
         >
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/AppLogsFilterContextualBar.spec.tsx.snap b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/AppLogsFilterContextualBar.spec.tsx.snap
index b8fc2fb2e641c..54a9cc484a557 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/AppLogsFilterContextualBar.spec.tsx.snap
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/AppLogsFilterContextualBar.spec.tsx.snap
@@ -144,14 +144,14 @@ exports[`renders AppLogsItem without crashing 1`] = `
                     <button
                       aria-expanded="false"
                       aria-haspopup="listbox"
-                      aria-labelledby="react-aria-:r8: timeFilterLabel"
+                      aria-labelledby="react-aria-_r_8_ timeFilterLabel"
                       class="rcx-box rcx-box--full rcx-select rcx-css-1vw6rc6"
                       id="timeFilter"
                       type="button"
                     >
                       <span
                         class="rcx-box rcx-box--full rcx-css-11g6st8"
-                        id="react-aria-:r8:"
+                        id="react-aria-_r_8_"
                       />
                       <i
                         aria-hidden="true"
@@ -351,14 +351,14 @@ exports[`renders AppLogsItem without crashing 1`] = `
                       aria-expanded="false"
                       aria-haspopup="listbox"
                       aria-label="Severity"
-                      aria-labelledby="react-aria-:rg: react-aria-:rb: severityFilterLabel"
+                      aria-labelledby="react-aria-_r_g_ react-aria-_r_b_ severityFilterLabel"
                       class="rcx-box rcx-box--full rcx-select rcx-css-1vw6rc6"
                       id="severityFilter"
                       type="button"
                     >
                       <span
                         class="rcx-box rcx-box--full rcx-css-e3nij6"
-                        id="react-aria-:rg:"
+                        id="react-aria-_r_g_"
                       >
                         All
                       </span>
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/AppLogsFilterExpanded.spec.tsx.snap b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/AppLogsFilterExpanded.spec.tsx.snap
index 387e4b58d3d22..70da08df16dd5 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/AppLogsFilterExpanded.spec.tsx.snap
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/AppLogsFilterExpanded.spec.tsx.snap
@@ -102,14 +102,14 @@ exports[`renders AppLogsItem without crashing 1`] = `
           <button
             aria-expanded="false"
             aria-haspopup="listbox"
-            aria-labelledby="react-aria-:r7: timeFilterLabel"
+            aria-labelledby="react-aria-_r_7_ timeFilterLabel"
             class="rcx-box rcx-box--full rcx-select rcx-css-1vw6rc6"
             id="timeFilter"
             type="button"
           >
             <span
               class="rcx-box rcx-box--full rcx-css-e3nij6"
-              id="react-aria-:r7:"
+              id="react-aria-_r_7_"
             >
               All_time
             </span>
@@ -193,14 +193,14 @@ exports[`renders AppLogsItem without crashing 1`] = `
             aria-expanded="false"
             aria-haspopup="listbox"
             aria-label="Severity"
-            aria-labelledby="react-aria-:rf: react-aria-:ra:"
+            aria-labelledby="react-aria-_r_f_ react-aria-_r_a_"
             class="rcx-box rcx-box--full rcx-select rcx-css-1vw6rc6"
             id="severityFilter"
             type="button"
           >
             <span
               class="rcx-box rcx-box--full rcx-css-e3nij6"
-              id="react-aria-:rf:"
+              id="react-aria-_r_f_"
             >
               All
             </span>
@@ -243,7 +243,7 @@ exports[`renders AppLogsItem without crashing 1`] = `
           aria-haspopup="true"
           aria-label="Options"
           class="rcx-box rcx-box--full rcx-button--large-square rcx-button--square rcx-button--icon rcx-button"
-          id="react-aria-:rg:"
+          id="react-aria-_r_g_"
           title="Options"
           type="button"
         >
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/DateTimeModal.spec.tsx.snap b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/DateTimeModal.spec.tsx.snap
index 5489ed4013760..f5f13cc12edea 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/DateTimeModal.spec.tsx.snap
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/DateTimeModal.spec.tsx.snap
@@ -67,7 +67,6 @@ exports[`renders AppLogsItem without crashing 1`] = `
                       name="startDate"
                       size="1"
                       type="date"
-                      value=""
                     />
                     <span
                       class="rcx-box rcx-box--full rcx-input-box__addon"
@@ -89,7 +88,6 @@ exports[`renders AppLogsItem without crashing 1`] = `
                       name="startTime"
                       size="1"
                       type="time"
-                      value=""
                     />
                     <span
                       class="rcx-box rcx-box--full rcx-input-box__addon"
@@ -125,7 +123,6 @@ exports[`renders AppLogsItem without crashing 1`] = `
                       name="endDate"
                       size="1"
                       type="date"
-                      value=""
                     />
                     <span
                       class="rcx-box rcx-box--full rcx-input-box__addon"
@@ -147,7 +144,6 @@ exports[`renders AppLogsItem without crashing 1`] = `
                       name="endTime"
                       size="1"
                       type="time"
-                      value=""
                     />
                     <span
                       class="rcx-box rcx-box--full rcx-input-box__addon"
diff --git a/apps/meteor/client/views/omnichannel/cannedResponses/contextualBar/CannedResponse/__snapshots__/CannedResponseList.spec.tsx.snap b/apps/meteor/client/views/omnichannel/cannedResponses/contextualBar/CannedResponse/__snapshots__/CannedResponseList.spec.tsx.snap
index 08038443f876d..1f571835961c7 100644
--- a/apps/meteor/client/views/omnichannel/cannedResponses/contextualBar/CannedResponse/__snapshots__/CannedResponseList.spec.tsx.snap
+++ b/apps/meteor/client/views/omnichannel/cannedResponses/contextualBar/CannedResponse/__snapshots__/CannedResponseList.spec.tsx.snap
@@ -63,7 +63,6 @@ exports[`CannedResponseList Storybook Stories renders Default without crashing 1
                     placeholder="Search"
                     size="1"
                     type="text"
-                    value=""
                   />
                   <span
                     class="rcx-box rcx-box--full rcx-input-box__addon"
@@ -117,13 +116,13 @@ exports[`CannedResponseList Storybook Stories renders Default without crashing 1
                     aria-expanded="false"
                     aria-haspopup="listbox"
                     aria-label="Type"
-                    aria-labelledby="react-aria-:r8: react-aria-:r3:"
+                    aria-labelledby="react-aria-_r_8_ react-aria-_r_3_"
                     class="rcx-box rcx-box--full rcx-select rcx-css-1vw6rc6"
                     type="button"
                   >
                     <span
                       class="rcx-box rcx-box--full rcx-css-11g6st8"
-                      id="react-aria-:r8:"
+                      id="react-aria-_r_8_"
                     />
                     <i
                       aria-hidden="true"
diff --git a/apps/meteor/client/views/omnichannel/modals/__snapshots__/ForwardChatModal.spec.tsx.snap b/apps/meteor/client/views/omnichannel/modals/__snapshots__/ForwardChatModal.spec.tsx.snap
index 4b1a4a85a5b29..2933d2c076aef 100644
--- a/apps/meteor/client/views/omnichannel/modals/__snapshots__/ForwardChatModal.spec.tsx.snap
+++ b/apps/meteor/client/views/omnichannel/modals/__snapshots__/ForwardChatModal.spec.tsx.snap
@@ -4,7 +4,7 @@ exports[`renders Default without crashing 1`] = `
 <body>
   <div>
     <dialog
-      aria-labelledby=":r3:-title"
+      aria-labelledby="_r_3_-title"
       aria-modal="true"
       class="rcx-box rcx-box--full rcx-modal"
       open=""
@@ -23,7 +23,7 @@ exports[`renders Default without crashing 1`] = `
             >
               <h2
                 class="rcx-box rcx-box--full rcx-modal__title"
-                id=":r3:-title"
+                id="_r_3_-title"
               >
                 Forward_chat
               </h2>
@@ -45,7 +45,7 @@ exports[`renders Default without crashing 1`] = `
               >
                 <label
                   class="rcx-box rcx-box--full rcx-field__label rcx-label"
-                  for=":r0:"
+                  for="_r_0_"
                 >
                   Forward_to_department
                 </label>
@@ -57,7 +57,7 @@ exports[`renders Default without crashing 1`] = `
                     aria-disabled="false"
                     aria-label="Forward_to_department"
                     class="rcx-box rcx-box--full rcx-select rcx-css-cjb8sk"
-                    id=":r0:"
+                    id="_r_0_"
                     name="department"
                   >
                     <div
@@ -104,7 +104,7 @@ exports[`renders Default without crashing 1`] = `
               >
                 <label
                   class="rcx-box rcx-box--full rcx-field__label rcx-label"
-                  for=":r1:"
+                  for="_r_1_"
                 >
                   Forward_to_user
                 </label>
@@ -114,7 +114,7 @@ exports[`renders Default without crashing 1`] = `
                   <div
                     aria-label="Forward_to_user"
                     class="rcx-box rcx-box--full rcx-select rcx-css-ue04py"
-                    id=":r1:"
+                    id="_r_1_"
                     name="username"
                   >
                     <div
@@ -145,7 +145,7 @@ exports[`renders Default without crashing 1`] = `
               >
                 <label
                   class="rcx-box rcx-box--full rcx-field__label rcx-label"
-                  for=":r2:"
+                  for="_r_2_"
                 >
                   Leave_a_comment
                   <span
@@ -162,7 +162,7 @@ exports[`renders Default without crashing 1`] = `
                   <textarea
                     class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--type-textarea rcx-input-box rcx-css-t3n91h"
                     cols="1"
-                    id=":r2:"
+                    id="_r_2_"
                     name="comment"
                     rows="8"
                     size="1"
diff --git a/apps/meteor/client/views/omnichannel/modals/__snapshots__/ReturnChatQueueModal.spec.tsx.snap b/apps/meteor/client/views/omnichannel/modals/__snapshots__/ReturnChatQueueModal.spec.tsx.snap
index 8de70012aa772..407960b640a5f 100644
--- a/apps/meteor/client/views/omnichannel/modals/__snapshots__/ReturnChatQueueModal.spec.tsx.snap
+++ b/apps/meteor/client/views/omnichannel/modals/__snapshots__/ReturnChatQueueModal.spec.tsx.snap
@@ -4,7 +4,7 @@ exports[`renders Default without crashing 1`] = `
 <body>
   <div>
     <dialog
-      aria-labelledby=":r0:-title"
+      aria-labelledby="_r_0_-title"
       aria-modal="true"
       class="rcx-box rcx-box--full rcx-modal"
       open=""
@@ -33,7 +33,7 @@ exports[`renders Default without crashing 1`] = `
             >
               <h2
                 class="rcx-box rcx-box--full rcx-modal__title"
-                id=":r0:-title"
+                id="_r_0_-title"
               >
                 Return_to_the_queue
               </h2>
diff --git a/apps/meteor/client/views/room/contextualBar/BannedUsers/__snapshots__/BannedUsers.spec.tsx.snap b/apps/meteor/client/views/room/contextualBar/BannedUsers/__snapshots__/BannedUsers.spec.tsx.snap
index d8921fe4a7256..94649944f7380 100644
--- a/apps/meteor/client/views/room/contextualBar/BannedUsers/__snapshots__/BannedUsers.spec.tsx.snap
+++ b/apps/meteor/client/views/room/contextualBar/BannedUsers/__snapshots__/BannedUsers.spec.tsx.snap
@@ -143,7 +143,7 @@ exports[`renders Default without crashing 1`] = `
                                 aria-haspopup="true"
                                 aria-label="More"
                                 class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
-                                id="react-aria-:r1:"
+                                id="react-aria-_r_1_"
                                 title="More"
                                 type="button"
                               >
@@ -213,7 +213,7 @@ exports[`renders Default without crashing 1`] = `
                                 aria-haspopup="true"
                                 aria-label="More"
                                 class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
-                                id="react-aria-:r3:"
+                                id="react-aria-_r_3_"
                                 title="More"
                                 type="button"
                               >
@@ -296,7 +296,7 @@ exports[`renders Default without crashing 1`] = `
                                 aria-haspopup="true"
                                 aria-label="More"
                                 class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
-                                id="react-aria-:r5:"
+                                id="react-aria-_r_5_"
                                 title="More"
                                 type="button"
                               >
@@ -863,7 +863,7 @@ exports[`renders WithRealNames without crashing 1`] = `
                                 aria-haspopup="true"
                                 aria-label="More"
                                 class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
-                                id="react-aria-:rb:"
+                                id="react-aria-_r_b_"
                                 title="More"
                                 type="button"
                               >
@@ -939,7 +939,7 @@ exports[`renders WithRealNames without crashing 1`] = `
                                 aria-haspopup="true"
                                 aria-label="More"
                                 class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
-                                id="react-aria-:rd:"
+                                id="react-aria-_r_d_"
                                 title="More"
                                 type="button"
                               >
@@ -1028,7 +1028,7 @@ exports[`renders WithRealNames without crashing 1`] = `
                                 aria-haspopup="true"
                                 aria-label="More"
                                 class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
-                                id="react-aria-:rf:"
+                                id="react-aria-_r_f_"
                                 title="More"
                                 type="button"
                               >
diff --git a/apps/meteor/client/views/room/contextualBar/Discussions/__snapshots__/DiscussionsList.spec.tsx.snap b/apps/meteor/client/views/room/contextualBar/Discussions/__snapshots__/DiscussionsList.spec.tsx.snap
index add5b58b92ccb..dcfb001ba5d42 100644
--- a/apps/meteor/client/views/room/contextualBar/Discussions/__snapshots__/DiscussionsList.spec.tsx.snap
+++ b/apps/meteor/client/views/room/contextualBar/Discussions/__snapshots__/DiscussionsList.spec.tsx.snap
@@ -59,7 +59,7 @@ exports[`renders Default with stable structure 1`] = `
               class="rcx-box rcx-box--full rcx-label rcx-box rcx-box--full rcx-box--animated rcx-input-box__wrapper"
             >
               <input
-                aria-controls=":r6:"
+                aria-controls="_r_6_"
                 aria-label="Search_Messages"
                 class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--undecorated rcx-input-box--type-text rcx-input-box"
                 placeholder="Search_Messages"
@@ -90,7 +90,7 @@ exports[`renders Default with stable structure 1`] = `
             </div>
             <div
               class="rcx-box rcx-box--full rcx-css-4k230l"
-              id=":r6:"
+              id="_r_6_"
             >
               <div
                 class="rcx-box rcx-box--full rcx-css-1cb6i7s"
@@ -1186,7 +1186,7 @@ exports[`renders Empty with stable structure 1`] = `
               class="rcx-box rcx-box--full rcx-label rcx-box rcx-box--full rcx-box--animated rcx-input-box__wrapper"
             >
               <input
-                aria-controls=":r8:"
+                aria-controls="_r_8_"
                 aria-label="Search_Messages"
                 class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--undecorated rcx-input-box--type-text rcx-input-box"
                 placeholder="Search_Messages"
@@ -1217,7 +1217,7 @@ exports[`renders Empty with stable structure 1`] = `
             </div>
             <div
               class="rcx-box rcx-box--full rcx-css-4k230l"
-              id=":r8:"
+              id="_r_8_"
             >
               <div
                 class="rcx-box rcx-box--full rcx-vertical-bar__content rcx-css-r8c38r"
diff --git a/apps/meteor/client/views/room/contextualBar/RoomFiles/__snapshots__/RoomFiles.spec.tsx.snap b/apps/meteor/client/views/room/contextualBar/RoomFiles/__snapshots__/RoomFiles.spec.tsx.snap
index 052345a970340..12a5914ebf5a7 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomFiles/__snapshots__/RoomFiles.spec.tsx.snap
+++ b/apps/meteor/client/views/room/contextualBar/RoomFiles/__snapshots__/RoomFiles.spec.tsx.snap
@@ -46,7 +46,7 @@ exports[`renders Default without crashing 1`] = `
               class="rcx-box rcx-box--full rcx-label rcx-box rcx-box--full rcx-box--animated rcx-input-box__wrapper"
             >
               <input
-                aria-controls=":r0:"
+                aria-controls="_r_0_"
                 aria-label="Search_Files"
                 class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--undecorated rcx-input-box--type-text rcx-input-box"
                 data-qa-files-search="true"
@@ -121,13 +121,13 @@ exports[`renders Default without crashing 1`] = `
               <button
                 aria-expanded="false"
                 aria-haspopup="listbox"
-                aria-labelledby="react-aria-:r9:"
+                aria-labelledby="react-aria-_r_9_"
                 class="rcx-box rcx-box--full rcx-select rcx-css-1vw6rc6"
                 type="button"
               >
                 <span
                   class="rcx-box rcx-box--full rcx-css-e3nij6"
-                  id="react-aria-:r9:"
+                  id="react-aria-_r_9_"
                 >
                   All
                 </span>
@@ -151,7 +151,7 @@ exports[`renders Default without crashing 1`] = `
             </div>
             <div
               class="rcx-box rcx-box--full rcx-css-kotrsu"
-              id=":r0:"
+              id="_r_0_"
             >
               <div
                 class="rcx-box rcx-box--full rcx-css-vlo1oi rcx-css-1cb6i7s"
@@ -264,7 +264,7 @@ exports[`renders Empty without crashing 1`] = `
               class="rcx-box rcx-box--full rcx-label rcx-box rcx-box--full rcx-box--animated rcx-input-box__wrapper"
             >
               <input
-                aria-controls=":ra:"
+                aria-controls="_r_a_"
                 aria-label="Search_Files"
                 class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--undecorated rcx-input-box--type-text rcx-input-box"
                 data-qa-files-search="true"
@@ -339,13 +339,13 @@ exports[`renders Empty without crashing 1`] = `
               <button
                 aria-expanded="false"
                 aria-haspopup="listbox"
-                aria-labelledby="react-aria-:rj:"
+                aria-labelledby="react-aria-_r_j_"
                 class="rcx-box rcx-box--full rcx-select rcx-css-1vw6rc6"
                 type="button"
               >
                 <span
                   class="rcx-box rcx-box--full rcx-css-e3nij6"
-                  id="react-aria-:rj:"
+                  id="react-aria-_r_j_"
                 >
                   All
                 </span>
@@ -369,7 +369,7 @@ exports[`renders Empty without crashing 1`] = `
             </div>
             <div
               class="rcx-box rcx-box--full rcx-css-kotrsu"
-              id=":ra:"
+              id="_r_a_"
             >
               <div
                 class="rcx-box rcx-box--full rcx-vertical-bar__content rcx-css-r8c38r"
@@ -553,13 +553,13 @@ exports[`renders Loading without crashing 1`] = `
               <button
                 aria-expanded="false"
                 aria-haspopup="listbox"
-                aria-labelledby="react-aria-:rt:"
+                aria-labelledby="react-aria-_r_t_"
                 class="rcx-box rcx-box--full rcx-select rcx-css-1vw6rc6"
                 type="button"
               >
                 <span
                   class="rcx-box rcx-box--full rcx-css-e3nij6"
-                  id="react-aria-:rt:"
+                  id="react-aria-_r_t_"
                 >
                   All
                 </span>
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/__snapshots__/InviteUsers.spec.tsx.snap b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/__snapshots__/InviteUsers.spec.tsx.snap
index e0fb1f549d460..07a2e6df9502b 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/__snapshots__/InviteUsers.spec.tsx.snap
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/__snapshots__/InviteUsers.spec.tsx.snap
@@ -86,7 +86,7 @@ exports[`renders Default without crashing 1`] = `
                   >
                     <label
                       class="rcx-box rcx-box--full rcx-field__label rcx-label rcx-css-irxdij"
-                      for=":r1:"
+                      for="_r_1_"
                     >
                       Invite link
                     </label>
@@ -98,7 +98,7 @@ exports[`renders Default without crashing 1`] = `
                       >
                         <input
                           class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--undecorated rcx-input-box--type-url rcx-input-box"
-                          id=":r1:"
+                          id="_r_1_"
                           size="1"
                           type="url"
                           value="https://go.rocket.chat/invite?host=open.rocket.chat&path=invite%2F5sBs3a"
@@ -276,7 +276,7 @@ exports[`renders InviteEdit without crashing 1`] = `
                   >
                     <label
                       class="rcx-box rcx-box--full rcx-field__label rcx-label rcx-css-irxdij"
-                      for=":r3:"
+                      for="_r_3_"
                     >
                       Expiration (Days)
                     </label>
@@ -331,14 +331,14 @@ exports[`renders InviteEdit without crashing 1`] = `
                       <button
                         aria-expanded="false"
                         aria-haspopup="listbox"
-                        aria-labelledby="react-aria-:rc:"
+                        aria-labelledby="react-aria-_r_c_"
                         class="rcx-box rcx-box--full rcx-select rcx-css-1vw6rc6"
-                        id=":r3:"
+                        id="_r_3_"
                         type="button"
                       >
                         <span
                           class="rcx-box rcx-box--full rcx-css-e3nij6"
-                          id="react-aria-:rc:"
+                          id="react-aria-_r_c_"
                         >
                           1
                         </span>
@@ -356,7 +356,7 @@ exports[`renders InviteEdit without crashing 1`] = `
                   >
                     <label
                       class="rcx-box rcx-box--full rcx-field__label rcx-label rcx-css-irxdij"
-                      for=":r4:"
+                      for="_r_4_"
                     >
                       Max number of uses
                     </label>
@@ -416,14 +416,14 @@ exports[`renders InviteEdit without crashing 1`] = `
                       <button
                         aria-expanded="false"
                         aria-haspopup="listbox"
-                        aria-labelledby="react-aria-:rk:"
+                        aria-labelledby="react-aria-_r_k_"
                         class="rcx-box rcx-box--full rcx-select rcx-css-1vw6rc6"
-                        id=":r4:"
+                        id="_r_4_"
                         type="button"
                       >
                         <span
                           class="rcx-box rcx-box--full rcx-css-e3nij6"
-                          id="react-aria-:rk:"
+                          id="react-aria-_r_k_"
                         >
                           5
                         </span>
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/__snapshots__/RoomMembers.spec.tsx.snap b/apps/meteor/client/views/room/contextualBar/RoomMembers/__snapshots__/RoomMembers.spec.tsx.snap
index 73e497bad7475..899a8d3bcc785 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/__snapshots__/RoomMembers.spec.tsx.snap
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/__snapshots__/RoomMembers.spec.tsx.snap
@@ -46,7 +46,7 @@ exports[`renders Default without crashing 1`] = `
               class="rcx-box rcx-box--full rcx-label rcx-box rcx-box--full rcx-box--animated rcx-input-box__wrapper"
             >
               <input
-                aria-controls=":r0:"
+                aria-controls="_r_0_"
                 aria-label="Search_by_username"
                 class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--undecorated rcx-input-box--type-text rcx-input-box"
                 placeholder="Search_by_username"
@@ -100,13 +100,13 @@ exports[`renders Default without crashing 1`] = `
               <button
                 aria-expanded="false"
                 aria-haspopup="listbox"
-                aria-labelledby="react-aria-:r9:"
+                aria-labelledby="react-aria-_r_9_"
                 class="rcx-box rcx-box--full rcx-select rcx-css-1vw6rc6"
                 type="button"
               >
                 <span
                   class="rcx-box rcx-box--full rcx-css-e3nij6"
-                  id="react-aria-:r9:"
+                  id="react-aria-_r_9_"
                 >
                   Online
                 </span>
@@ -139,7 +139,7 @@ exports[`renders Default without crashing 1`] = `
             </div>
             <div
               class="rcx-box rcx-box--full rcx-css-4k230l"
-              id=":r0:"
+              id="_r_0_"
             >
               <div
                 class="rcx-box rcx-box--full rcx-css-vlo1oi rcx-css-1cb6i7s"
@@ -262,7 +262,7 @@ exports[`renders Empty without crashing 1`] = `
               class="rcx-box rcx-box--full rcx-label rcx-box rcx-box--full rcx-box--animated rcx-input-box__wrapper"
             >
               <input
-                aria-controls=":ra:"
+                aria-controls="_r_a_"
                 aria-label="Search_by_username"
                 class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--undecorated rcx-input-box--type-text rcx-input-box"
                 placeholder="Search_by_username"
@@ -316,13 +316,13 @@ exports[`renders Empty without crashing 1`] = `
               <button
                 aria-expanded="false"
                 aria-haspopup="listbox"
-                aria-labelledby="react-aria-:rj:"
+                aria-labelledby="react-aria-_r_j_"
                 class="rcx-box rcx-box--full rcx-select rcx-css-1vw6rc6"
                 type="button"
               >
                 <span
                   class="rcx-box rcx-box--full rcx-css-e3nij6"
-                  id="react-aria-:rj:"
+                  id="react-aria-_r_j_"
                 >
                   Online
                 </span>
@@ -346,7 +346,7 @@ exports[`renders Empty without crashing 1`] = `
             </div>
             <div
               class="rcx-box rcx-box--full rcx-css-4k230l"
-              id=":ra:"
+              id="_r_a_"
             >
               <div
                 class="rcx-box rcx-box--full rcx-vertical-bar__content rcx-css-r8c38r"
@@ -509,13 +509,13 @@ exports[`renders Loading without crashing 1`] = `
               <button
                 aria-expanded="false"
                 aria-haspopup="listbox"
-                aria-labelledby="react-aria-:rt:"
+                aria-labelledby="react-aria-_r_t_"
                 class="rcx-box rcx-box--full rcx-select rcx-css-1vw6rc6"
                 type="button"
               >
                 <span
                   class="rcx-box rcx-box--full rcx-css-e3nij6"
-                  id="react-aria-:rt:"
+                  id="react-aria-_r_t_"
                 >
                   Online
                 </span>
@@ -640,7 +640,7 @@ exports[`renders WithABACRoom without crashing 1`] = `
               class="rcx-box rcx-box--full rcx-label rcx-box rcx-box--full rcx-box--animated rcx-input-box__wrapper"
             >
               <input
-                aria-controls=":ru:"
+                aria-controls="_r_u_"
                 aria-label="Search_by_username"
                 class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--undecorated rcx-input-box--type-text rcx-input-box"
                 placeholder="Search_by_username"
@@ -694,13 +694,13 @@ exports[`renders WithABACRoom without crashing 1`] = `
               <button
                 aria-expanded="false"
                 aria-haspopup="listbox"
-                aria-labelledby="react-aria-:r17:"
+                aria-labelledby="react-aria-_r_17_"
                 class="rcx-box rcx-box--full rcx-select rcx-css-1vw6rc6"
                 type="button"
               >
                 <span
                   class="rcx-box rcx-box--full rcx-css-e3nij6"
-                  id="react-aria-:r17:"
+                  id="react-aria-_r_17_"
                 >
                   Online
                 </span>
@@ -733,7 +733,7 @@ exports[`renders WithABACRoom without crashing 1`] = `
             </div>
             <div
               class="rcx-box rcx-box--full rcx-css-4k230l"
-              id=":ru:"
+              id="_r_u_"
             >
               <div
                 class="rcx-box rcx-box--full rcx-css-vlo1oi rcx-css-1cb6i7s"
@@ -856,7 +856,7 @@ exports[`renders WithInvitedMember without crashing 1`] = `
               class="rcx-box rcx-box--full rcx-label rcx-box rcx-box--full rcx-box--animated rcx-input-box__wrapper"
             >
               <input
-                aria-controls=":r18:"
+                aria-controls="_r_18_"
                 aria-label="Search_by_username"
                 class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--undecorated rcx-input-box--type-text rcx-input-box"
                 placeholder="Search_by_username"
@@ -910,13 +910,13 @@ exports[`renders WithInvitedMember without crashing 1`] = `
               <button
                 aria-expanded="false"
                 aria-haspopup="listbox"
-                aria-labelledby="react-aria-:r1h:"
+                aria-labelledby="react-aria-_r_1h_"
                 class="rcx-box rcx-box--full rcx-select rcx-css-1vw6rc6"
                 type="button"
               >
                 <span
                   class="rcx-box rcx-box--full rcx-css-e3nij6"
-                  id="react-aria-:r1h:"
+                  id="react-aria-_r_1h_"
                 >
                   Online
                 </span>
@@ -949,7 +949,7 @@ exports[`renders WithInvitedMember without crashing 1`] = `
             </div>
             <div
               class="rcx-box rcx-box--full rcx-css-4k230l"
-              id=":r18:"
+              id="_r_18_"
             >
               <div
                 class="rcx-box rcx-box--full rcx-css-vlo1oi rcx-css-1cb6i7s"
diff --git a/apps/meteor/client/views/room/modals/FileUploadModal/__snapshots__/FileUploadModal.spec.tsx.snap b/apps/meteor/client/views/room/modals/FileUploadModal/__snapshots__/FileUploadModal.spec.tsx.snap
index c42e6ebe31a16..b2c57507e7313 100644
--- a/apps/meteor/client/views/room/modals/FileUploadModal/__snapshots__/FileUploadModal.spec.tsx.snap
+++ b/apps/meteor/client/views/room/modals/FileUploadModal/__snapshots__/FileUploadModal.spec.tsx.snap
@@ -4,14 +4,14 @@ exports[`renders Default without crashing 1`] = `
 <body>
   <div>
     <dialog
-      aria-labelledby=":r0:-title"
+      aria-labelledby="_r_0_-title"
       aria-modal="true"
       class="rcx-box rcx-box--full rcx-modal"
       open=""
     >
       <form
         class="rcx-box rcx-box--full rcx-modal__inner rcx-css-1euli2f"
-        id=":r0:"
+        id="_r_0_"
       >
         <div
           class="rcx-box rcx-box--full rcx-css-ogq2n4"
@@ -24,7 +24,7 @@ exports[`renders Default without crashing 1`] = `
             >
               <h2
                 class="rcx-box rcx-box--full rcx-modal__title rcx-css-trljwa rcx-css-lma364"
-                id=":r0:-title"
+                id="_r_0_-title"
               >
                 FileUpload
               </h2>
@@ -73,7 +73,7 @@ exports[`renders Default without crashing 1`] = `
                 >
                   <label
                     class="rcx-box rcx-box--full rcx-field__label rcx-label"
-                    for="react-aria-:r1:-label"
+                    for="react-aria-_r_1_-label"
                   >
                     Upload_file_name
                   </label>
@@ -85,7 +85,7 @@ exports[`renders Default without crashing 1`] = `
                       aria-invalid="false"
                       aria-required="true"
                       class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--type-text rcx-input-box"
-                      id="react-aria-:r1:-label"
+                      id="react-aria-_r_1_-label"
                       name="name"
                       size="1"
                       type="text"
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index e3d9d9b80a883..37b5aca8adb69 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -107,10 +107,10 @@
 		"@rocket.chat/favicon": "workspace:^",
 		"@rocket.chat/federation-matrix": "workspace:^",
 		"@rocket.chat/federation-sdk": "0.6.3",
-		"@rocket.chat/fuselage": "^0.79.1",
-		"@rocket.chat/fuselage-forms": "^1.3.0",
-		"@rocket.chat/fuselage-hooks": "^0.41.0",
-		"@rocket.chat/fuselage-toastbar": "^0.35.2",
+		"@rocket.chat/fuselage": "~0.80.0",
+		"@rocket.chat/fuselage-forms": "~1.4.0",
+		"@rocket.chat/fuselage-hooks": "~0.42.0",
+		"@rocket.chat/fuselage-toastbar": "~0.36.0",
 		"@rocket.chat/fuselage-tokens": "~0.33.2",
 		"@rocket.chat/fuselage-ui-kit": "workspace:^",
 		"@rocket.chat/gazzodown": "workspace:^",
@@ -119,11 +119,11 @@
 		"@rocket.chat/icons": "^0.48.0",
 		"@rocket.chat/instance-status": "workspace:^",
 		"@rocket.chat/jwt": "workspace:^",
-		"@rocket.chat/layout": "^0.34.3",
+		"@rocket.chat/layout": "~0.35.0",
 		"@rocket.chat/license": "workspace:^",
 		"@rocket.chat/log-format": "workspace:^",
 		"@rocket.chat/logger": "workspace:^",
-		"@rocket.chat/logo": "^0.32.5",
+		"@rocket.chat/logo": "~0.33.0",
 		"@rocket.chat/media-calls": "workspace:^",
 		"@rocket.chat/media-signaling": "workspace:^",
 		"@rocket.chat/memo": "~0.31.25",
@@ -137,7 +137,7 @@
 		"@rocket.chat/omni-core": "workspace:^",
 		"@rocket.chat/omni-core-ee": "workspace:^",
 		"@rocket.chat/omnichannel-services": "workspace:^",
-		"@rocket.chat/onboarding-ui": "^0.36.2",
+		"@rocket.chat/onboarding-ui": "~0.37.0",
 		"@rocket.chat/password-policies": "workspace:^",
 		"@rocket.chat/patch-injection": "workspace:^",
 		"@rocket.chat/pdf-worker": "workspace:^",
@@ -149,7 +149,7 @@
 		"@rocket.chat/server-fetch": "workspace:^",
 		"@rocket.chat/sha256": "workspace:^",
 		"@rocket.chat/string-helpers": "~0.32.0",
-		"@rocket.chat/styled": "^0.33.0",
+		"@rocket.chat/styled": "~0.34.0",
 		"@rocket.chat/tools": "workspace:^",
 		"@rocket.chat/tracing": "workspace:^",
 		"@rocket.chat/ui-avatar": "workspace:^",
diff --git a/apps/uikit-playground/package.json b/apps/uikit-playground/package.json
index 0adbd4c2484a6..159ed3066ac55 100644
--- a/apps/uikit-playground/package.json
+++ b/apps/uikit-playground/package.json
@@ -18,14 +18,14 @@
 		"@lezer/highlight": "^1.2.3",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/css-in-js": "^0.32.0",
-		"@rocket.chat/fuselage": "^0.79.1",
-		"@rocket.chat/fuselage-hooks": "^0.41.0",
-		"@rocket.chat/fuselage-toastbar": "^0.35.2",
+		"@rocket.chat/fuselage": "~0.80.0",
+		"@rocket.chat/fuselage-hooks": "~0.42.0",
+		"@rocket.chat/fuselage-toastbar": "~0.36.0",
 		"@rocket.chat/fuselage-tokens": "~0.33.2",
 		"@rocket.chat/fuselage-ui-kit": "workspace:~",
 		"@rocket.chat/icons": "^0.48.0",
-		"@rocket.chat/logo": "^0.32.5",
-		"@rocket.chat/styled": "^0.33.0",
+		"@rocket.chat/logo": "~0.33.0",
+		"@rocket.chat/styled": "~0.34.0",
 		"@rocket.chat/ui-avatar": "workspace:^",
 		"@rocket.chat/ui-contexts": "workspace:~",
 		"codemirror": "^6.0.2",
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index b403d0e817f1b..fa036e585d891 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -46,14 +46,14 @@
 		"@rocket.chat/apps-engine": "workspace:^",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/emitter": "^0.32.0",
-		"@rocket.chat/fuselage": "^0.79.1",
-		"@rocket.chat/fuselage-hooks": "^0.41.0",
+		"@rocket.chat/fuselage": "~0.80.0",
+		"@rocket.chat/fuselage-hooks": "~0.42.0",
 		"@rocket.chat/fuselage-tokens": "~0.33.2",
 		"@rocket.chat/icons": "^0.48.0",
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@rocket.chat/mock-providers": "workspace:^",
 		"@rocket.chat/storybook-config": "workspace:~",
-		"@rocket.chat/styled": "^0.33.0",
+		"@rocket.chat/styled": "~0.34.0",
 		"@rocket.chat/tsconfig": "workspace:*",
 		"@rocket.chat/ui-avatar": "workspace:^",
 		"@rocket.chat/ui-contexts": "workspace:^",
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index 77acfcadef300..cac1fbe5d442d 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -31,14 +31,14 @@
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/css-in-js": "^0.32.0",
 		"@rocket.chat/emitter": "^0.32.0",
-		"@rocket.chat/fuselage": "^0.79.1",
-		"@rocket.chat/fuselage-hooks": "^0.41.0",
+		"@rocket.chat/fuselage": "~0.80.0",
+		"@rocket.chat/fuselage-hooks": "~0.42.0",
 		"@rocket.chat/fuselage-tokens": "~0.33.2",
 		"@rocket.chat/icons": "^0.48.0",
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@rocket.chat/message-parser": "workspace:^",
 		"@rocket.chat/storybook-config": "workspace:~",
-		"@rocket.chat/styled": "^0.33.0",
+		"@rocket.chat/styled": "~0.34.0",
 		"@rocket.chat/tsconfig": "workspace:*",
 		"@rocket.chat/ui-client": "workspace:^",
 		"@rocket.chat/ui-contexts": "workspace:^",
diff --git a/packages/livechat/package.json b/packages/livechat/package.json
index c0cdf3511260c..6080c3ba19127 100644
--- a/packages/livechat/package.json
+++ b/packages/livechat/package.json
@@ -57,9 +57,9 @@
 		"@babel/preset-typescript": "~7.28.5",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/ddp-client": "workspace:^",
-		"@rocket.chat/fuselage-hooks": "^0.41.0",
+		"@rocket.chat/fuselage-hooks": "~0.42.0",
 		"@rocket.chat/fuselage-tokens": "~0.33.2",
-		"@rocket.chat/logo": "^0.32.5",
+		"@rocket.chat/logo": "~0.33.0",
 		"@rocket.chat/ui-contexts": "workspace:^",
 		"@storybook/addon-docs": "^9.1.13",
 		"@storybook/addon-styling-webpack": "^1.0.1",
diff --git a/packages/storybook-config/package.json b/packages/storybook-config/package.json
index df438cd84cd55..f856b15996208 100644
--- a/packages/storybook-config/package.json
+++ b/packages/storybook-config/package.json
@@ -20,7 +20,7 @@
 	},
 	"dependencies": {
 		"@rocket.chat/emitter": "^0.32.0",
-		"@rocket.chat/fuselage-hooks": "^0.41.0",
+		"@rocket.chat/fuselage-hooks": "~0.42.0",
 		"@rocket.chat/fuselage-tokens": "~0.33.2",
 		"@storybook/addon-a11y": "^9.1.13",
 		"@storybook/addon-docs": "^9.1.13",
@@ -33,7 +33,7 @@
 		"webpack": "~5.104.1"
 	},
 	"devDependencies": {
-		"@rocket.chat/fuselage": "^0.79.1",
+		"@rocket.chat/fuselage": "~0.80.0",
 		"@rocket.chat/icons": "^0.48.0",
 		"@rocket.chat/tsconfig": "workspace:*",
 		"@storybook/react": "^9.1.13",
diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json
index d1815b670bec1..29070d624de9f 100644
--- a/packages/ui-avatar/package.json
+++ b/packages/ui-avatar/package.json
@@ -17,8 +17,8 @@
 	"devDependencies": {
 		"@rocket.chat/core-typings": "workspace:~",
 		"@rocket.chat/emitter": "^0.32.0",
-		"@rocket.chat/fuselage": "^0.79.1",
-		"@rocket.chat/fuselage-hooks": "^0.41.0",
+		"@rocket.chat/fuselage": "~0.80.0",
+		"@rocket.chat/fuselage-hooks": "~0.42.0",
 		"@rocket.chat/fuselage-tokens": "~0.33.2",
 		"@rocket.chat/icons": "^0.48.0",
 		"@rocket.chat/ui-contexts": "workspace:^",
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index cba543ae7fd24..b2ff4b2ca4661 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -18,7 +18,7 @@
 		"typecheck": "tsc --noEmit"
 	},
 	"dependencies": {
-		"@rocket.chat/onboarding-ui": "~0.36.2",
+		"@rocket.chat/onboarding-ui": "~0.37.0",
 		"dompurify": "~3.4.7"
 	},
 	"devDependencies": {
@@ -26,17 +26,17 @@
 		"@rocket.chat/core-typings": "workspace:~",
 		"@rocket.chat/css-in-js": "^0.32.0",
 		"@rocket.chat/emitter": "^0.32.0",
-		"@rocket.chat/fuselage": "^0.79.1",
-		"@rocket.chat/fuselage-hooks": "^0.41.0",
+		"@rocket.chat/fuselage": "~0.80.0",
+		"@rocket.chat/fuselage-hooks": "~0.42.0",
 		"@rocket.chat/fuselage-tokens": "~0.33.2",
 		"@rocket.chat/icons": "^0.48.0",
 		"@rocket.chat/jest-presets": "workspace:~",
-		"@rocket.chat/layout": "^0.34.3",
-		"@rocket.chat/logo": "^0.32.5",
+		"@rocket.chat/layout": "~0.35.0",
+		"@rocket.chat/logo": "~0.33.0",
 		"@rocket.chat/mock-providers": "workspace:^",
 		"@rocket.chat/models": "workspace:~",
 		"@rocket.chat/storybook-config": "workspace:~",
-		"@rocket.chat/styled": "^0.33.0",
+		"@rocket.chat/styled": "~0.34.0",
 		"@rocket.chat/tsconfig": "workspace:*",
 		"@rocket.chat/ui-avatar": "workspace:~",
 		"@rocket.chat/ui-contexts": "workspace:~",
diff --git a/packages/ui-client/src/components/Modal/GenericModal/__snapshots__/GenericModal.spec.tsx.snap b/packages/ui-client/src/components/Modal/GenericModal/__snapshots__/GenericModal.spec.tsx.snap
index fdc0cd1f8b752..3586bd333da28 100644
--- a/packages/ui-client/src/components/Modal/GenericModal/__snapshots__/GenericModal.spec.tsx.snap
+++ b/packages/ui-client/src/components/Modal/GenericModal/__snapshots__/GenericModal.spec.tsx.snap
@@ -2,7 +2,7 @@
 
 exports[`renders should render a modal without crashing 1`] = `
 <dialog
-  aria-labelledby=":r0:-title"
+  aria-labelledby="_r_0_-title"
   aria-modal="true"
   class="rcx-box rcx-box--full rcx-modal"
   open=""
@@ -31,7 +31,7 @@ exports[`renders should render a modal without crashing 1`] = `
         >
           <h2
             class="rcx-box rcx-box--full rcx-modal__title"
-            id=":r0:-title"
+            id="_r_0_-title"
           >
             Modal
           </h2>
diff --git a/packages/ui-composer/package.json b/packages/ui-composer/package.json
index 877f8c6bed124..8ca87879ed39b 100644
--- a/packages/ui-composer/package.json
+++ b/packages/ui-composer/package.json
@@ -22,8 +22,8 @@
 	"devDependencies": {
 		"@react-aria/toolbar": "^3.0.0-nightly.5042",
 		"@rocket.chat/emitter": "^0.32.0",
-		"@rocket.chat/fuselage": "^0.79.1",
-		"@rocket.chat/fuselage-hooks": "^0.41.0",
+		"@rocket.chat/fuselage": "~0.80.0",
+		"@rocket.chat/fuselage-hooks": "~0.42.0",
 		"@rocket.chat/fuselage-tokens": "~0.33.2",
 		"@rocket.chat/icons": "^0.48.0",
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json
index bf01755803dba..556f3ace7430a 100644
--- a/packages/ui-contexts/package.json
+++ b/packages/ui-contexts/package.json
@@ -23,8 +23,8 @@
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/ddp-client": "workspace:~",
 		"@rocket.chat/emitter": "^0.32.0",
-		"@rocket.chat/fuselage": "^0.79.1",
-		"@rocket.chat/fuselage-hooks": "^0.41.0",
+		"@rocket.chat/fuselage": "~0.80.0",
+		"@rocket.chat/fuselage-hooks": "~0.42.0",
 		"@rocket.chat/fuselage-tokens": "~0.33.2",
 		"@rocket.chat/i18n": "workspace:~",
 		"@rocket.chat/icons": "^0.48.0",
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index f4b83668b0746..9e94d0c9a0d01 100644
--- a/packages/ui-video-conf/package.json
+++ b/packages/ui-video-conf/package.json
@@ -22,13 +22,13 @@
 	},
 	"devDependencies": {
 		"@rocket.chat/css-in-js": "^0.32.0",
-		"@rocket.chat/fuselage": "^0.79.1",
-		"@rocket.chat/fuselage-hooks": "^0.41.0",
+		"@rocket.chat/fuselage": "~0.80.0",
+		"@rocket.chat/fuselage-hooks": "~0.42.0",
 		"@rocket.chat/fuselage-tokens": "~0.33.2",
 		"@rocket.chat/icons": "^0.48.0",
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@rocket.chat/storybook-config": "workspace:~",
-		"@rocket.chat/styled": "^0.33.0",
+		"@rocket.chat/styled": "~0.34.0",
 		"@rocket.chat/tsconfig": "workspace:*",
 		"@rocket.chat/ui-avatar": "workspace:^",
 		"@rocket.chat/ui-contexts": "workspace:^",
diff --git a/packages/ui-voip/package.json b/packages/ui-voip/package.json
index 06c3b01ed364b..6271f98e7e10e 100644
--- a/packages/ui-voip/package.json
+++ b/packages/ui-voip/package.json
@@ -31,15 +31,15 @@
 		"@react-spectrum/test-utils": "~1.0.0-alpha.8",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/css-in-js": "^0.32.0",
-		"@rocket.chat/fuselage": "^0.79.1",
-		"@rocket.chat/fuselage-hooks": "^0.41.0",
+		"@rocket.chat/fuselage": "~0.80.0",
+		"@rocket.chat/fuselage-hooks": "~0.42.0",
 		"@rocket.chat/fuselage-tokens": "~0.33.2",
 		"@rocket.chat/fuselage-ui-kit": "workspace:^",
 		"@rocket.chat/icons": "^0.48.0",
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@rocket.chat/mock-providers": "workspace:~",
 		"@rocket.chat/storybook-config": "workspace:~",
-		"@rocket.chat/styled": "^0.33.0",
+		"@rocket.chat/styled": "~0.34.0",
 		"@rocket.chat/tsconfig": "workspace:*",
 		"@rocket.chat/ui-avatar": "workspace:^",
 		"@rocket.chat/ui-client": "workspace:^",
diff --git a/packages/ui-voip/src/views/CallHistoryContextualbar/__snapshots__/CallHistoryContextualbar.spec.tsx.snap b/packages/ui-voip/src/views/CallHistoryContextualbar/__snapshots__/CallHistoryContextualbar.spec.tsx.snap
index d71435b5a9f7b..1a9e2ef7315d8 100644
--- a/packages/ui-voip/src/views/CallHistoryContextualbar/__snapshots__/CallHistoryContextualbar.spec.tsx.snap
+++ b/packages/ui-voip/src/views/CallHistoryContextualbar/__snapshots__/CallHistoryContextualbar.spec.tsx.snap
@@ -43,7 +43,7 @@ exports[`renders Default without crashing 1`] = `
                 aria-haspopup="true"
                 aria-label="Options"
                 class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
-                id="react-aria-:r1:"
+                id="react-aria-_r_1_"
                 title="Options"
                 type="button"
               >
@@ -402,7 +402,7 @@ exports[`renders ExternalContact without crashing 1`] = `
                 aria-haspopup="true"
                 aria-label="Options"
                 class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
-                id="react-aria-:r4:"
+                id="react-aria-_r_4_"
                 title="Options"
                 type="button"
               >
diff --git a/packages/ui-voip/src/views/MediaCallWidget/__snapshots__/MediaCallWidget.spec.tsx.snap b/packages/ui-voip/src/views/MediaCallWidget/__snapshots__/MediaCallWidget.spec.tsx.snap
index ec457f006cea5..8249d8514cf0a 100644
--- a/packages/ui-voip/src/views/MediaCallWidget/__snapshots__/MediaCallWidget.spec.tsx.snap
+++ b/packages/ui-voip/src/views/MediaCallWidget/__snapshots__/MediaCallWidget.spec.tsx.snap
@@ -444,7 +444,7 @@ exports[`renders NewCall without crashing 1`] = `
               >
                 <input
                   aria-invalid="false"
-                  aria-labelledby=":r0:"
+                  aria-labelledby="_r_0_"
                   class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--undecorated rcx-input-box rcx-css-trljwa rcx-css-rcil7k"
                   value=""
                 />
@@ -463,7 +463,7 @@ exports[`renders NewCall without crashing 1`] = `
           </span>
           <span
             class="rcx-box rcx-box--full rcx-field__description"
-            id=":r0:"
+            id="_r_0_"
           >
             Enter username or number
           </span>
diff --git a/packages/ui-voip/src/views/PermissionFlow/__snapshots__/PermissionFlowModal.spec.tsx.snap b/packages/ui-voip/src/views/PermissionFlow/__snapshots__/PermissionFlowModal.spec.tsx.snap
index 83f3d40d5ac35..de4438ea57671 100644
--- a/packages/ui-voip/src/views/PermissionFlow/__snapshots__/PermissionFlowModal.spec.tsx.snap
+++ b/packages/ui-voip/src/views/PermissionFlow/__snapshots__/PermissionFlowModal.spec.tsx.snap
@@ -4,7 +4,7 @@ exports[`renders PermissionFlowModalDenied without crashing 1`] = `
 <body>
   <div>
     <dialog
-      aria-labelledby=":r0:"
+      aria-labelledby="_r_0_"
       aria-modal="true"
       class="rcx-box rcx-box--full rcx-modal"
       open=""
@@ -20,7 +20,7 @@ exports[`renders PermissionFlowModalDenied without crashing 1`] = `
           >
             <h2
               class="rcx-box rcx-box--full rcx-modal__title rcx-css-trljwa rcx-css-lma364"
-              id=":r0:"
+              id="_r_0_"
             >
               Mic/speaker access required
             </h2>
@@ -82,7 +82,7 @@ exports[`renders PermissionFlowModalDeviceChangePrompt without crashing 1`] = `
 <body>
   <div>
     <dialog
-      aria-labelledby=":r1:"
+      aria-labelledby="_r_1_"
       aria-modal="true"
       class="rcx-box rcx-box--full rcx-modal"
       open=""
@@ -98,7 +98,7 @@ exports[`renders PermissionFlowModalDeviceChangePrompt without crashing 1`] = `
           >
             <h2
               class="rcx-box rcx-box--full rcx-modal__title rcx-css-trljwa rcx-css-lma364"
-              id=":r1:"
+              id="_r_1_"
             >
               Mic/speaker access required
             </h2>
@@ -170,7 +170,7 @@ exports[`renders PermissionFlowModalIncomingPrompt without crashing 1`] = `
 <body>
   <div>
     <dialog
-      aria-labelledby=":r2:"
+      aria-labelledby="_r_2_"
       aria-modal="true"
       class="rcx-box rcx-box--full rcx-modal"
       open=""
@@ -186,7 +186,7 @@ exports[`renders PermissionFlowModalIncomingPrompt without crashing 1`] = `
           >
             <h2
               class="rcx-box rcx-box--full rcx-modal__title rcx-css-trljwa rcx-css-lma364"
-              id=":r2:"
+              id="_r_2_"
             >
               Mic/speaker access required
             </h2>
@@ -270,7 +270,7 @@ exports[`renders PermissionFlowModalOutgoingPrompt without crashing 1`] = `
 <body>
   <div>
     <dialog
-      aria-labelledby=":r3:"
+      aria-labelledby="_r_3_"
       aria-modal="true"
       class="rcx-box rcx-box--full rcx-modal"
       open=""
@@ -286,7 +286,7 @@ exports[`renders PermissionFlowModalOutgoingPrompt without crashing 1`] = `
           >
             <h2
               class="rcx-box rcx-box--full rcx-modal__title rcx-css-trljwa rcx-css-lma364"
-              id=":r3:"
+              id="_r_3_"
             >
               Mic/speaker access required
             </h2>
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index 5f428c27fb3d3..2de1555ef16ee 100644
--- a/packages/web-ui-registration/package.json
+++ b/packages/web-ui-registration/package.json
@@ -23,12 +23,12 @@
 		"@rocket.chat/core-typings": "workspace:~",
 		"@rocket.chat/css-in-js": "^0.32.0",
 		"@rocket.chat/emitter": "^0.32.0",
-		"@rocket.chat/fuselage": "^0.79.1",
-		"@rocket.chat/fuselage-hooks": "^0.41.0",
+		"@rocket.chat/fuselage": "~0.80.0",
+		"@rocket.chat/fuselage-hooks": "~0.42.0",
 		"@rocket.chat/fuselage-tokens": "~0.33.2",
 		"@rocket.chat/i18n": "workspace:~",
 		"@rocket.chat/icons": "^0.48.0",
-		"@rocket.chat/layout": "^0.34.3",
+		"@rocket.chat/layout": "~0.35.0",
 		"@rocket.chat/mock-providers": "workspace:~",
 		"@rocket.chat/rest-typings": "workspace:~",
 		"@rocket.chat/storybook-config": "workspace:~",
diff --git a/yarn.lock b/yarn.lock
index dd99c9b5e4629..3e5ec590f2a9f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8999,7 +8999,6 @@ __metadata:
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/model-typings": "workspace:^"
     "@rocket.chat/tsconfig": "workspace:*"
-    "@seald-io/nedb": "npm:^4.1.2"
     "@types/adm-zip": "npm:^0.5.7"
     "@types/debug": "npm:^4.1.12"
     "@types/lodash.clonedeep": "npm:^4.5.9"
@@ -9348,9 +9347,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rocket.chat/fuselage-forms@npm:^1.3.0":
-  version: 1.3.0
-  resolution: "@rocket.chat/fuselage-forms@npm:1.3.0"
+"@rocket.chat/fuselage-forms@npm:~1.4.0":
+  version: 1.4.0
+  resolution: "@rocket.chat/fuselage-forms@npm:1.4.0"
   dependencies:
     "@rocket.chat/emitter": "npm:^0.32.0"
     react-aria: "npm:~3.37.0"
@@ -9359,24 +9358,24 @@ __metadata:
     "@rocket.chat/fuselage-hooks": "*"
     react: "*"
     react-dom: "*"
-  checksum: 10/a6337c7b4e6d41da529f15b0a1892b6ce10ff6b48e459893561f35b28ac23140a646d1e4126e4d2c02d03a8ea1451d50baa653256e4c988a2a66942db1fea07b
+  checksum: 10/b2b3407653ddfbf1d67fe68268ed2a00ea8af8e0f09a83d75a687a5f017b0b3919e58a672ea61adf3ed6db8e1c99439139317299844b1e625f83368b98db1252
   languageName: node
   linkType: hard
 
-"@rocket.chat/fuselage-hooks@npm:^0.41.0":
-  version: 0.41.0
-  resolution: "@rocket.chat/fuselage-hooks@npm:0.41.0"
+"@rocket.chat/fuselage-hooks@npm:~0.42.0":
+  version: 0.42.0
+  resolution: "@rocket.chat/fuselage-hooks@npm:0.42.0"
   peerDependencies:
     "@rocket.chat/emitter": "*"
     "@rocket.chat/fuselage-tokens": "*"
     react: "*"
-  checksum: 10/eb38c4baaa4a62333beadfcb867c734113edd07918565da65338ed538a5f8991f01be55e5c36567e562771862e85cca3d833715a614ed109a1a44e67847c6078
+  checksum: 10/ccda7dfc29f1930e9d62017ceeb6f04545f0941b14124857c24725564698d251604c21910fa4f6075db50aa9e8f49652eb304c144dd8aee0c589342717ddadae
   languageName: node
   linkType: hard
 
-"@rocket.chat/fuselage-toastbar@npm:^0.35.2":
-  version: 0.35.2
-  resolution: "@rocket.chat/fuselage-toastbar@npm:0.35.2"
+"@rocket.chat/fuselage-toastbar@npm:~0.36.0":
+  version: 0.36.0
+  resolution: "@rocket.chat/fuselage-toastbar@npm:0.36.0"
   dependencies:
     react-timing-hooks: "npm:~4.0.2"
   peerDependencies:
@@ -9385,7 +9384,7 @@ __metadata:
     "@rocket.chat/styled": "*"
     react: "*"
     react-dom: "*"
-  checksum: 10/bfd28f73ea016ffa87845369ff82fbedc4344b03337fb4d890dde4a16d2b1cd3f88b34ea71f58a47493c3792f6759690f755a54d3a0723aa618396e9bfad2ed0
+  checksum: 10/e4edb78ca3d26f9153cfc49d88aac8d6a297958d0f1980dea83c7484637633ea39a74b20e37c64c7b862835b1aa088b77bdc5d8c6a3bde921868903c21834332
   languageName: node
   linkType: hard
 
@@ -9403,15 +9402,15 @@ __metadata:
     "@rocket.chat/apps-engine": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/emitter": "npm:^0.32.0"
-    "@rocket.chat/fuselage": "npm:^0.79.1"
-    "@rocket.chat/fuselage-hooks": "npm:^0.41.0"
+    "@rocket.chat/fuselage": "npm:~0.80.0"
+    "@rocket.chat/fuselage-hooks": "npm:~0.42.0"
     "@rocket.chat/fuselage-tokens": "npm:~0.33.2"
     "@rocket.chat/gazzodown": "workspace:^"
     "@rocket.chat/icons": "npm:^0.48.0"
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/mock-providers": "workspace:^"
     "@rocket.chat/storybook-config": "workspace:~"
-    "@rocket.chat/styled": "npm:^0.33.0"
+    "@rocket.chat/styled": "npm:~0.34.0"
     "@rocket.chat/tsconfig": "workspace:*"
     "@rocket.chat/ui-avatar": "workspace:^"
     "@rocket.chat/ui-contexts": "workspace:^"
@@ -9458,9 +9457,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/fuselage@npm:^0.79.1":
-  version: 0.79.1
-  resolution: "@rocket.chat/fuselage@npm:0.79.1"
+"@rocket.chat/fuselage@npm:~0.80.0":
+  version: 0.80.0
+  resolution: "@rocket.chat/fuselage@npm:0.80.0"
   dependencies:
     "@rocket.chat/css-in-js": "npm:^0.32.0"
     "@rocket.chat/css-supports": "npm:^0.31.25"
@@ -9468,7 +9467,8 @@ __metadata:
     "@rocket.chat/memo": "npm:^0.31.25"
     invariant: "npm:^2.2.4"
     react-aria: "npm:~3.37.0"
-    react-keyed-flatten-children: "npm:^1.3.0"
+    react-is: "npm:~19.2.7"
+    react-keyed-flatten-children: "npm:~5.1.2"
     react-stately: "npm:~3.35.0"
   peerDependencies:
     "@rocket.chat/fuselage-hooks": "*"
@@ -9476,7 +9476,7 @@ __metadata:
     react: "*"
     react-dom: "*"
     react-virtuoso: "*"
-  checksum: 10/112bf6eb1a9b30214fca24c23bff3ae9082adfd21f8d3cefe728ca7f96844d0d203c1bcb1bd3f5dae524290a81aa33a9855102615e922b036fa89a9703c4338f
+  checksum: 10/1026ad667a843fa018ba4cd01055bad8070cfb7ca8c86eff551a0364c0c0d4343f2b1b40326660202d0364033b9d26e0f2d5fc27eca7730b4d7a7d5a7ff057de
   languageName: node
   linkType: hard
 
@@ -9487,14 +9487,14 @@ __metadata:
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/css-in-js": "npm:^0.32.0"
     "@rocket.chat/emitter": "npm:^0.32.0"
-    "@rocket.chat/fuselage": "npm:^0.79.1"
-    "@rocket.chat/fuselage-hooks": "npm:^0.41.0"
+    "@rocket.chat/fuselage": "npm:~0.80.0"
+    "@rocket.chat/fuselage-hooks": "npm:~0.42.0"
     "@rocket.chat/fuselage-tokens": "npm:~0.33.2"
     "@rocket.chat/icons": "npm:^0.48.0"
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/message-parser": "workspace:^"
     "@rocket.chat/storybook-config": "workspace:~"
-    "@rocket.chat/styled": "npm:^0.33.0"
+    "@rocket.chat/styled": "npm:~0.34.0"
     "@rocket.chat/tsconfig": "workspace:*"
     "@rocket.chat/ui-client": "workspace:^"
     "@rocket.chat/ui-contexts": "workspace:^"
@@ -9638,16 +9638,16 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/layout@npm:^0.34.3":
-  version: 0.34.3
-  resolution: "@rocket.chat/layout@npm:0.34.3"
+"@rocket.chat/layout@npm:~0.35.0":
+  version: 0.35.0
+  resolution: "@rocket.chat/layout@npm:0.35.0"
   peerDependencies:
     "@rocket.chat/fuselage": "*"
     "@rocket.chat/logo": "*"
     react: "*"
     react-dom: "*"
     react-i18next: "*"
-  checksum: 10/d751437cf83780d544b897e7971098e14f43e4395745df85f220a95472c7227dd1b1ebf509604650adf2fef32fc96e6247a7cc797907dbd200a70c75e0c3837f
+  checksum: 10/6978a3de811d481ce772c78464fe42879e8b8f7fd41ff55bc34adcac84c69e55e0072d3f121b2811b423ec949d64022878b7383fc88aff70222620989c721769
   languageName: node
   linkType: hard
 
@@ -9682,10 +9682,10 @@ __metadata:
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/ddp-client": "workspace:^"
     "@rocket.chat/emitter": "npm:^0.32.0"
-    "@rocket.chat/fuselage-hooks": "npm:^0.41.0"
+    "@rocket.chat/fuselage-hooks": "npm:~0.42.0"
     "@rocket.chat/fuselage-tokens": "npm:~0.33.2"
     "@rocket.chat/gazzodown": "workspace:^"
-    "@rocket.chat/logo": "npm:^0.32.5"
+    "@rocket.chat/logo": "npm:~0.33.0"
     "@rocket.chat/message-parser": "workspace:^"
     "@rocket.chat/random": "workspace:~"
     "@rocket.chat/ui-contexts": "workspace:^"
@@ -9785,15 +9785,15 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/logo@npm:^0.32.5":
-  version: 0.32.5
-  resolution: "@rocket.chat/logo@npm:0.32.5"
+"@rocket.chat/logo@npm:~0.33.0":
+  version: 0.33.0
+  resolution: "@rocket.chat/logo@npm:0.33.0"
   dependencies:
-    "@rocket.chat/styled": "npm:^0.33.0"
+    "@rocket.chat/styled": "npm:^0.34.0"
   peerDependencies:
     react: "*"
     react-dom: "*"
-  checksum: 10/c46e8711ec112b439f582ac84713e57b0c692419f609809e97a9798dbde35dd6575269442264e654453c66c75df92a30911b73a9c219a0a5ca3b8338e2366148
+  checksum: 10/1aba42d497c796f0642f943872f6cac29a9359fb0cb5bd8041bf820802c9fe34ea1298075df9a34b80ab458a1ec4923c137a9e605b6e3158dc63ea7a2ad3443c
   languageName: node
   linkType: hard
 
@@ -9932,10 +9932,10 @@ __metadata:
     "@rocket.chat/favicon": "workspace:^"
     "@rocket.chat/federation-matrix": "workspace:^"
     "@rocket.chat/federation-sdk": "npm:0.6.3"
-    "@rocket.chat/fuselage": "npm:^0.79.1"
-    "@rocket.chat/fuselage-forms": "npm:^1.3.0"
-    "@rocket.chat/fuselage-hooks": "npm:^0.41.0"
-    "@rocket.chat/fuselage-toastbar": "npm:^0.35.2"
+    "@rocket.chat/fuselage": "npm:~0.80.0"
+    "@rocket.chat/fuselage-forms": "npm:~1.4.0"
+    "@rocket.chat/fuselage-hooks": "npm:~0.42.0"
+    "@rocket.chat/fuselage-toastbar": "npm:~0.36.0"
     "@rocket.chat/fuselage-tokens": "npm:~0.33.2"
     "@rocket.chat/fuselage-ui-kit": "workspace:^"
     "@rocket.chat/gazzodown": "workspace:^"
@@ -9945,12 +9945,12 @@ __metadata:
     "@rocket.chat/instance-status": "workspace:^"
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/jwt": "workspace:^"
-    "@rocket.chat/layout": "npm:^0.34.3"
+    "@rocket.chat/layout": "npm:~0.35.0"
     "@rocket.chat/license": "workspace:^"
     "@rocket.chat/livechat": "workspace:^"
     "@rocket.chat/log-format": "workspace:^"
     "@rocket.chat/logger": "workspace:^"
-    "@rocket.chat/logo": "npm:^0.32.5"
+    "@rocket.chat/logo": "npm:~0.33.0"
     "@rocket.chat/media-calls": "workspace:^"
     "@rocket.chat/media-signaling": "workspace:^"
     "@rocket.chat/memo": "npm:~0.31.25"
@@ -9965,7 +9965,7 @@ __metadata:
     "@rocket.chat/omni-core": "workspace:^"
     "@rocket.chat/omni-core-ee": "workspace:^"
     "@rocket.chat/omnichannel-services": "workspace:^"
-    "@rocket.chat/onboarding-ui": "npm:^0.36.2"
+    "@rocket.chat/onboarding-ui": "npm:~0.37.0"
     "@rocket.chat/password-policies": "workspace:^"
     "@rocket.chat/patch-injection": "workspace:^"
     "@rocket.chat/pdf-worker": "workspace:^"
@@ -9978,7 +9978,7 @@ __metadata:
     "@rocket.chat/sha256": "workspace:^"
     "@rocket.chat/storybook-config": "workspace:~"
     "@rocket.chat/string-helpers": "npm:~0.32.0"
-    "@rocket.chat/styled": "npm:^0.33.0"
+    "@rocket.chat/styled": "npm:~0.34.0"
     "@rocket.chat/tools": "workspace:^"
     "@rocket.chat/tracing": "workspace:^"
     "@rocket.chat/tsconfig": "workspace:*"
@@ -10502,9 +10502,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/onboarding-ui@npm:^0.36.2, @rocket.chat/onboarding-ui@npm:~0.36.2":
-  version: 0.36.2
-  resolution: "@rocket.chat/onboarding-ui@npm:0.36.2"
+"@rocket.chat/onboarding-ui@npm:~0.37.0":
+  version: 0.37.0
+  resolution: "@rocket.chat/onboarding-ui@npm:0.37.0"
   dependencies:
     i18next: "npm:~23.4.9"
     react-hook-form: "npm:~7.54.2"
@@ -10518,7 +10518,7 @@ __metadata:
     react: "*"
     react-dom: "*"
     react-i18next: "*"
-  checksum: 10/2201758c345332158bb1dc0b3627cc15f220c600731348b78bc187f8cc93c232b4efdbaed63603ea554170613ba04e734d3bc616546ad618913a07721e913d0d
+  checksum: 10/c11af2e98c631c36fa37351c2a52028ba9caa109f3d8c655e6f9cf8ad200dd508abe991e6c630732b82c4acc206c8e19e3222307e1970de00bc1fb8e713e2faf
   languageName: node
   linkType: hard
 
@@ -10651,6 +10651,7 @@ __metadata:
     "@rocket.chat/apps-engine": "workspace:^"
     "@rocket.chat/core-services": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
+    "@rocket.chat/logger": "workspace:^"
     "@rocket.chat/models": "workspace:^"
     "@rocket.chat/rest-typings": "workspace:^"
     "@types/node": "npm:~22.19.17"
@@ -10817,8 +10818,8 @@ __metadata:
   resolution: "@rocket.chat/storybook-config@workspace:packages/storybook-config"
   dependencies:
     "@rocket.chat/emitter": "npm:^0.32.0"
-    "@rocket.chat/fuselage": "npm:^0.79.1"
-    "@rocket.chat/fuselage-hooks": "npm:^0.41.0"
+    "@rocket.chat/fuselage": "npm:~0.80.0"
+    "@rocket.chat/fuselage-hooks": "npm:~0.42.0"
     "@rocket.chat/fuselage-tokens": "npm:~0.33.2"
     "@rocket.chat/icons": "npm:^0.48.0"
     "@rocket.chat/tsconfig": "workspace:*"
@@ -10851,12 +10852,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rocket.chat/styled@npm:^0.33.0":
-  version: 0.33.0
-  resolution: "@rocket.chat/styled@npm:0.33.0"
+"@rocket.chat/styled@npm:^0.34.0, @rocket.chat/styled@npm:~0.34.0":
+  version: 0.34.0
+  resolution: "@rocket.chat/styled@npm:0.34.0"
   dependencies:
     "@rocket.chat/css-in-js": "npm:^0.32.0"
-  checksum: 10/d9514e67f0c7af55b6975d28e0afcd750b71439d9174874a67836f65bf221b64d537fcfdc2a258f407e8e0bf93fd7bd5cd09a9102d192eb4b35becbe5e00642b
+  checksum: 10/8eee631d5eb24c525b4da56afab79015af1424dbe42495494d2223e472abf39460abb5beffd9e6d12f69e2b873df9b0be7885dc1cdef072e00879a34a72a7691
   languageName: node
   linkType: hard
 
@@ -10912,8 +10913,8 @@ __metadata:
   dependencies:
     "@rocket.chat/core-typings": "workspace:~"
     "@rocket.chat/emitter": "npm:^0.32.0"
-    "@rocket.chat/fuselage": "npm:^0.79.1"
-    "@rocket.chat/fuselage-hooks": "npm:^0.41.0"
+    "@rocket.chat/fuselage": "npm:~0.80.0"
+    "@rocket.chat/fuselage-hooks": "npm:~0.42.0"
     "@rocket.chat/fuselage-tokens": "npm:~0.33.2"
     "@rocket.chat/icons": "npm:^0.48.0"
     "@rocket.chat/ui-contexts": "workspace:^"
@@ -10939,18 +10940,18 @@ __metadata:
     "@rocket.chat/core-typings": "workspace:~"
     "@rocket.chat/css-in-js": "npm:^0.32.0"
     "@rocket.chat/emitter": "npm:^0.32.0"
-    "@rocket.chat/fuselage": "npm:^0.79.1"
-    "@rocket.chat/fuselage-hooks": "npm:^0.41.0"
+    "@rocket.chat/fuselage": "npm:~0.80.0"
+    "@rocket.chat/fuselage-hooks": "npm:~0.42.0"
     "@rocket.chat/fuselage-tokens": "npm:~0.33.2"
     "@rocket.chat/icons": "npm:^0.48.0"
     "@rocket.chat/jest-presets": "workspace:~"
-    "@rocket.chat/layout": "npm:^0.34.3"
-    "@rocket.chat/logo": "npm:^0.32.5"
+    "@rocket.chat/layout": "npm:~0.35.0"
+    "@rocket.chat/logo": "npm:~0.33.0"
     "@rocket.chat/mock-providers": "workspace:^"
     "@rocket.chat/models": "workspace:~"
-    "@rocket.chat/onboarding-ui": "npm:~0.36.2"
+    "@rocket.chat/onboarding-ui": "npm:~0.37.0"
     "@rocket.chat/storybook-config": "workspace:~"
-    "@rocket.chat/styled": "npm:^0.33.0"
+    "@rocket.chat/styled": "npm:~0.34.0"
     "@rocket.chat/tsconfig": "workspace:*"
     "@rocket.chat/ui-avatar": "workspace:~"
     "@rocket.chat/ui-contexts": "workspace:~"
@@ -10996,8 +10997,8 @@ __metadata:
   dependencies:
     "@react-aria/toolbar": "npm:^3.0.0-nightly.5042"
     "@rocket.chat/emitter": "npm:^0.32.0"
-    "@rocket.chat/fuselage": "npm:^0.79.1"
-    "@rocket.chat/fuselage-hooks": "npm:^0.41.0"
+    "@rocket.chat/fuselage": "npm:~0.80.0"
+    "@rocket.chat/fuselage-hooks": "npm:~0.42.0"
     "@rocket.chat/fuselage-tokens": "npm:~0.33.2"
     "@rocket.chat/icons": "npm:^0.48.0"
     "@rocket.chat/jest-presets": "workspace:~"
@@ -11036,8 +11037,8 @@ __metadata:
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/ddp-client": "workspace:~"
     "@rocket.chat/emitter": "npm:^0.32.0"
-    "@rocket.chat/fuselage": "npm:^0.79.1"
-    "@rocket.chat/fuselage-hooks": "npm:^0.41.0"
+    "@rocket.chat/fuselage": "npm:~0.80.0"
+    "@rocket.chat/fuselage-hooks": "npm:~0.42.0"
     "@rocket.chat/fuselage-tokens": "npm:~0.33.2"
     "@rocket.chat/i18n": "workspace:~"
     "@rocket.chat/icons": "npm:^0.48.0"
@@ -11095,13 +11096,13 @@ __metadata:
   dependencies:
     "@rocket.chat/css-in-js": "npm:^0.32.0"
     "@rocket.chat/emitter": "npm:^0.32.0"
-    "@rocket.chat/fuselage": "npm:^0.79.1"
-    "@rocket.chat/fuselage-hooks": "npm:^0.41.0"
+    "@rocket.chat/fuselage": "npm:~0.80.0"
+    "@rocket.chat/fuselage-hooks": "npm:~0.42.0"
     "@rocket.chat/fuselage-tokens": "npm:~0.33.2"
     "@rocket.chat/icons": "npm:^0.48.0"
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/storybook-config": "workspace:~"
-    "@rocket.chat/styled": "npm:^0.33.0"
+    "@rocket.chat/styled": "npm:~0.34.0"
     "@rocket.chat/tsconfig": "workspace:*"
     "@rocket.chat/ui-avatar": "workspace:^"
     "@rocket.chat/ui-contexts": "workspace:^"
@@ -11142,8 +11143,8 @@ __metadata:
     "@rocket.chat/css-in-js": "npm:^0.32.0"
     "@rocket.chat/desktop-api": "workspace:^"
     "@rocket.chat/emitter": "npm:^0.32.0"
-    "@rocket.chat/fuselage": "npm:^0.79.1"
-    "@rocket.chat/fuselage-hooks": "npm:^0.41.0"
+    "@rocket.chat/fuselage": "npm:~0.80.0"
+    "@rocket.chat/fuselage-hooks": "npm:~0.42.0"
     "@rocket.chat/fuselage-tokens": "npm:~0.33.2"
     "@rocket.chat/fuselage-ui-kit": "workspace:^"
     "@rocket.chat/icons": "npm:^0.48.0"
@@ -11151,7 +11152,7 @@ __metadata:
     "@rocket.chat/media-signaling": "workspace:~"
     "@rocket.chat/mock-providers": "workspace:~"
     "@rocket.chat/storybook-config": "workspace:~"
-    "@rocket.chat/styled": "npm:^0.33.0"
+    "@rocket.chat/styled": "npm:~0.34.0"
     "@rocket.chat/tsconfig": "workspace:*"
     "@rocket.chat/ui-avatar": "workspace:^"
     "@rocket.chat/ui-client": "workspace:^"
@@ -11208,14 +11209,14 @@ __metadata:
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/css-in-js": "npm:^0.32.0"
     "@rocket.chat/emitter": "npm:^0.32.0"
-    "@rocket.chat/fuselage": "npm:^0.79.1"
-    "@rocket.chat/fuselage-hooks": "npm:^0.41.0"
-    "@rocket.chat/fuselage-toastbar": "npm:^0.35.2"
+    "@rocket.chat/fuselage": "npm:~0.80.0"
+    "@rocket.chat/fuselage-hooks": "npm:~0.42.0"
+    "@rocket.chat/fuselage-toastbar": "npm:~0.36.0"
     "@rocket.chat/fuselage-tokens": "npm:~0.33.2"
     "@rocket.chat/fuselage-ui-kit": "workspace:~"
     "@rocket.chat/icons": "npm:^0.48.0"
-    "@rocket.chat/logo": "npm:^0.32.5"
-    "@rocket.chat/styled": "npm:^0.33.0"
+    "@rocket.chat/logo": "npm:~0.33.0"
+    "@rocket.chat/styled": "npm:~0.34.0"
     "@rocket.chat/tsconfig": "workspace:*"
     "@rocket.chat/ui-avatar": "workspace:^"
     "@rocket.chat/ui-contexts": "workspace:~"
@@ -11246,12 +11247,12 @@ __metadata:
     "@rocket.chat/core-typings": "workspace:~"
     "@rocket.chat/css-in-js": "npm:^0.32.0"
     "@rocket.chat/emitter": "npm:^0.32.0"
-    "@rocket.chat/fuselage": "npm:^0.79.1"
-    "@rocket.chat/fuselage-hooks": "npm:^0.41.0"
+    "@rocket.chat/fuselage": "npm:~0.80.0"
+    "@rocket.chat/fuselage-hooks": "npm:~0.42.0"
     "@rocket.chat/fuselage-tokens": "npm:~0.33.2"
     "@rocket.chat/i18n": "workspace:~"
     "@rocket.chat/icons": "npm:^0.48.0"
-    "@rocket.chat/layout": "npm:^0.34.3"
+    "@rocket.chat/layout": "npm:~0.35.0"
     "@rocket.chat/mock-providers": "workspace:~"
     "@rocket.chat/rest-typings": "workspace:~"
     "@rocket.chat/storybook-config": "workspace:~"
@@ -11429,24 +11430,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@seald-io/binary-search-tree@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "@seald-io/binary-search-tree@npm:1.0.3"
-  checksum: 10/0eecd682f56b93557e0cbe4a5b55f48e31f217cae350a5000d397b3ea17a67da62e48dba665f1a9e28345a0d1eb92d287511c1af1dc9e32725157fd181ce7f19
-  languageName: node
-  linkType: hard
-
-"@seald-io/nedb@npm:^4.1.2":
-  version: 4.1.2
-  resolution: "@seald-io/nedb@npm:4.1.2"
-  dependencies:
-    "@seald-io/binary-search-tree": "npm:^1.0.3"
-    localforage: "npm:^1.10.0"
-    util: "npm:^0.12.5"
-  checksum: 10/9d78476bb2af52b18fb781e385a48dd3d4e8f6c40846e47ec499c6ff9e0c7db2f597fd4fcb1bf0e2f6d6096a8c6153fb84106109de01cfcfa583eb77f2bc1e74
-  languageName: node
-  linkType: hard
-
 "@selderee/plugin-htmlparser2@npm:~0.12.0":
   version: 0.12.0
   resolution: "@selderee/plugin-htmlparser2@npm:0.12.0"
@@ -31968,7 +31951,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-is@npm:^16.13.1, react-is@npm:^16.8.6":
+"react-is@npm:^16.13.1":
   version: 16.13.1
   resolution: "react-is@npm:16.13.1"
   checksum: 10/5aa564a1cde7d391ac980bedee21202fc90bdea3b399952117f54fb71a932af1e5902020144fb354b4690b2414a0c7aafe798eb617b76a3d441d956db7726fdf
@@ -31996,17 +31979,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-keyed-flatten-children@npm:^1.3.0":
-  version: 1.3.0
-  resolution: "react-keyed-flatten-children@npm:1.3.0"
-  dependencies:
-    react-is: "npm:^16.8.6"
-  peerDependencies:
-    react: ">=15.0.0"
-  checksum: 10/3bb042bb7cd48909491a5f92b8e7b2fb0417d69ad24bf04dbe1ed7a308cc7dfe6e3c9b5550e7b9016ee6bef61829b92e7f3a355ed1b867affd251bd518bcdd90
-  languageName: node
-  linkType: hard
-
 "react-keyed-flatten-children@npm:~5.1.2":
   version: 5.1.2
   resolution: "react-keyed-flatten-children@npm:5.1.2"

From 7c8e2ac4498c0835febfc78c8ee42a5f073484d2 Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso.evangelista@rocket.chat>
Date: Mon, 15 Jun 2026 21:08:10 -0300
Subject: [PATCH 4/8] refactor(pdf-worker): upgrade react-pdf

---
 ...act-pdf-layout-npm-4.6.1-b12fdb71f4.patch} |  11 +-
 apps/meteor/package.json                      |   2 +-
 ee/apps/omnichannel-transcript/package.json   |   2 +-
 ee/packages/pdf-worker/jest.config.ts         |   2 +-
 ee/packages/pdf-worker/package.json           |   2 +-
 ee/packages/pdf-worker/src/worker.spec.ts     |   1 +
 package.json                                  |   4 +-
 yarn.lock                                     | 429 ++++++------------
 8 files changed, 156 insertions(+), 297 deletions(-)
 rename .yarn/patches/{@react-pdf-layout-npm-4.4.2-6c2e3312fa.patch => @react-pdf-layout-npm-4.6.1-b12fdb71f4.patch} (56%)

diff --git a/.yarn/patches/@react-pdf-layout-npm-4.4.2-6c2e3312fa.patch b/.yarn/patches/@react-pdf-layout-npm-4.6.1-b12fdb71f4.patch
similarity index 56%
rename from .yarn/patches/@react-pdf-layout-npm-4.4.2-6c2e3312fa.patch
rename to .yarn/patches/@react-pdf-layout-npm-4.6.1-b12fdb71f4.patch
index a8271b2de103b..740c1484bde8c 100644
--- a/.yarn/patches/@react-pdf-layout-npm-4.4.2-6c2e3312fa.patch
+++ b/.yarn/patches/@react-pdf-layout-npm-4.6.1-b12fdb71f4.patch
@@ -1,5 +1,5 @@
 diff --git a/lib/index.js b/lib/index.js
-index c64bdf2d5f7e704a65be4e9a7116c5ee6a582701..ce6641d0b63daf7c5d3f8a1de773f290c0e9d51c 100644
+index b7ea5e30fddb9bdef0034c00f28bbd4f0dee584a..47f7717632bd55d3c42ebb39f1ef5a23c14cfa3a 100644
 --- a/lib/index.js
 +++ b/lib/index.js
 @@ -2,8 +2,8 @@ import { upperFirst, capitalize, parseFloat as parseFloat$1, without, pick, comp
@@ -13,3 +13,12 @@ index c64bdf2d5f7e704a65be4e9a7116c5ee6a582701..ce6641d0b63daf7c5d3f8a1de773f290
  import emojiRegex from 'emoji-regex-xs';
  import resolveImage from '@react-pdf/image';
  
+@@ -2998,7 +2998,7 @@ const splitPage = (page, pageNumber, fontStore, yoga) => {
+     const dynamicPage = resolveDynamicPage({ pageNumber }, page, fontStore, yoga);
+     const height = page.style.height;
+     const [currentChilds, nextChilds] = splitNodes(wrapArea, contentArea, dynamicPage.children);
+-    const relayout = (node) => 
++    const relayout = (node) =>
+     // @ts-expect-error rework pagination
+     relayoutPage(node, fontStore, yoga);
+     const currentBox = { ...page.box, height };
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index 37b5aca8adb69..901cf0bf91298 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -89,7 +89,7 @@
 		"@opentelemetry/sdk-node": "^0.217.0",
 		"@parse/node-apn": "^8.1.0",
 		"@react-aria/toolbar": "^3.0.0-nightly.5042",
-		"@react-pdf/renderer": "^4.3.2",
+		"@react-pdf/renderer": "~4.5.1",
 		"@rocket.chat/abac": "workspace:^",
 		"@rocket.chat/account-utils": "workspace:^",
 		"@rocket.chat/agenda": "workspace:^",
diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json
index b6c2709b4472a..a9b23e65925ab 100644
--- a/ee/apps/omnichannel-transcript/package.json
+++ b/ee/apps/omnichannel-transcript/package.json
@@ -19,7 +19,7 @@
 		"typecheck": "tsc --noEmit --skipLibCheck -p tsconfig.json"
 	},
 	"dependencies": {
-		"@react-pdf/renderer": "^3.4.5",
+		"@react-pdf/renderer": "~4.5.1",
 		"@rocket.chat/core-services": "workspace:^",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/emitter": "^0.32.0",
diff --git a/ee/packages/pdf-worker/jest.config.ts b/ee/packages/pdf-worker/jest.config.ts
index d189c66399801..d65b91b930e05 100644
--- a/ee/packages/pdf-worker/jest.config.ts
+++ b/ee/packages/pdf-worker/jest.config.ts
@@ -16,7 +16,7 @@ export default {
 			moduleNameMapper: {
 				'^fontkit($|/.+)': '<rootDir>/../../../node_modules/fontkit$1', // needed to a weird bug related to module resolution in SWC
 			},
-			transformIgnorePatterns: ['/node_modules/(?!(yoga-layout)/)'],
+			transformIgnorePatterns: ['/node_modules/(?!(yoga-layout|@react-pdf|color-string|color-name)/)'],
 			modulePathIgnorePatterns: ['<rootDir>/src/strategies/', '<rootDir>/src/templates/'],
 		},
 	],
diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json
index 84a39f1a42549..9ba90358708bc 100644
--- a/ee/packages/pdf-worker/package.json
+++ b/ee/packages/pdf-worker/package.json
@@ -18,7 +18,7 @@
 		"typecheck": "tsc --noEmit"
 	},
 	"dependencies": {
-		"@react-pdf/renderer": "^3.4.5",
+		"@react-pdf/renderer": "~4.5.1",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/fuselage-tokens": "~0.33.2",
 		"emoji-toolkit": "^7.0.1",
diff --git a/ee/packages/pdf-worker/src/worker.spec.ts b/ee/packages/pdf-worker/src/worker.spec.ts
index 55dbcfa6b384f..e774e632984dd 100644
--- a/ee/packages/pdf-worker/src/worker.spec.ts
+++ b/ee/packages/pdf-worker/src/worker.spec.ts
@@ -1,3 +1,4 @@
+/* eslint-disable testing-library/render-result-naming-convention */
 import { mkdtemp, writeFile } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
diff --git a/package.json b/package.json
index e35116a9b2e36..349ecc87abe5c 100644
--- a/package.json
+++ b/package.json
@@ -108,7 +108,6 @@
 		"yaml@npm:^2.8.1": "^2.8.3",
 		"yauzl": "^3.2.1",
 		"yoga-layout@npm:^3.2.1": "patch:yoga-layout@npm%3A3.2.1#~/.yarn/patches/yoga-layout-npm-3.2.1-51ec934670.patch",
-		"@react-pdf/layout@npm:^4.4.2": "patch:@react-pdf/layout@npm%3A4.4.2#~/.yarn/patches/@react-pdf-layout-npm-4.4.2-6c2e3312fa.patch",
 		"react-aria@npm:~3.37.0": "patch:react-aria@npm%3A3.37.0#~/.yarn/patches/react-aria-npm-3.37.0-83959bd2fa.patch",
 		"react-stately@npm:~3.35.0": "patch:react-stately@npm%3A3.17.0#~/.yarn/patches/react-stately-npm-3.17.0-264cc7a43c.patch",
 		"zod@npm:^3.25.0 || ^4.0.0": "patch:zod@npm%3A4.3.6#~/.yarn/patches/zod-npm-4.3.6-a096e305e6.patch",
@@ -174,7 +173,8 @@
 		"storybook/esbuild": "~0.28.1",
 		"tsx/esbuild": "0.28.1",
 		"qs": "6.15.2",
-		"uuid@npm:13": "13.0.1"
+		"uuid@npm:13": "13.0.1",
+		"@react-pdf/layout@npm:^4.6.1": "patch:@react-pdf/layout@npm%3A4.6.1#~/.yarn/patches/@react-pdf-layout-npm-4.6.1-b12fdb71f4.patch"
 	},
 	"dependencies": {
 		"@types/stream-buffers": "^3.0.8",
diff --git a/yarn.lock b/yarn.lock
index 3e5ec590f2a9f..cb13b0a80761d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5697,6 +5697,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@noble/ciphers@npm:^1.0.0":
+  version: 1.3.0
+  resolution: "@noble/ciphers@npm:1.3.0"
+  checksum: 10/051660051e3e9e2ca5fb9dece2885532b56b7e62946f89afa7284a0fb8bc02e2bd1c06554dba68162ff42d295b54026456084198610f63c296873b2f1cd7a586
+  languageName: node
+  linkType: hard
+
 "@noble/ed25519@npm:^3.0.0":
   version: 3.0.0
   resolution: "@noble/ed25519@npm:3.0.0"
@@ -5711,7 +5718,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@noble/hashes@npm:^1.1.5":
+"@noble/hashes@npm:^1.1.5, @noble/hashes@npm:^1.6.0":
   version: 1.8.0
   resolution: "@noble/hashes@npm:1.8.0"
   checksum: 10/474b7f56bc6fb2d5b3a42132561e221b0ea4f91e590f4655312ca13667840896b34195e2b53b7f097ec080a1fdd3b58d902c2a8d0fbdf51d2e238b53808a177e
@@ -7663,183 +7670,92 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@react-pdf/fns@npm:2.2.1":
-  version: 2.2.1
-  resolution: "@react-pdf/fns@npm:2.2.1"
-  dependencies:
-    "@babel/runtime": "npm:^7.20.13"
-  checksum: 10/e8da79803ceb74114260ac349ae51fdd40a308dd8a1023fb86b111e86bee79a4539c700fc0c5797c363f977f1acf5171c302bf621da8ec5fc0e0d3c684dfe5b9
-  languageName: node
-  linkType: hard
-
-"@react-pdf/fns@npm:3.1.2":
-  version: 3.1.2
-  resolution: "@react-pdf/fns@npm:3.1.2"
-  checksum: 10/b4b48167ae454587e2513b07166f44a21d908817b5e59dd72693f762c647038ecf6b4f18eecb468566613338ad1d5b4e16ade68d39ae852c9ef91ab54820224b
-  languageName: node
-  linkType: hard
-
-"@react-pdf/font@npm:^2.5.2":
-  version: 2.5.2
-  resolution: "@react-pdf/font@npm:2.5.2"
-  dependencies:
-    "@babel/runtime": "npm:^7.20.13"
-    "@react-pdf/types": "npm:^2.6.0"
-    cross-fetch: "npm:^3.1.5"
-    fontkit: "npm:^2.0.2"
-    is-url: "npm:^1.2.4"
-  checksum: 10/090497049faa1683dd167c3a543788f01fe5234ec712bbbda12589b79440427a841a4ceb146e4886681163cce29cca0d3d6e24ff26bfc749100e7862b6040cd6
+"@react-pdf/fns@npm:3.1.3":
+  version: 3.1.3
+  resolution: "@react-pdf/fns@npm:3.1.3"
+  checksum: 10/74bd3149fbee053b9023d322823d4620c904fd4a24d4a57a1f5d5a6cd1fb094494efb923982a953c8bac38e4080cb4a1a1a44aa269ee3eaf6fb667e8e681215b
   languageName: node
   linkType: hard
 
-"@react-pdf/font@npm:^4.0.4":
-  version: 4.0.4
-  resolution: "@react-pdf/font@npm:4.0.4"
+"@react-pdf/font@npm:^4.0.8":
+  version: 4.0.8
+  resolution: "@react-pdf/font@npm:4.0.8"
   dependencies:
-    "@react-pdf/pdfkit": "npm:^4.1.0"
-    "@react-pdf/types": "npm:^2.9.2"
+    "@react-pdf/pdfkit": "npm:^5.1.1"
+    "@react-pdf/types": "npm:^2.11.1"
     fontkit: "npm:^2.0.2"
     is-url: "npm:^1.2.4"
-  checksum: 10/9a753df9b2473eadb0e3660bae738a1a493651d9bc9428a1471ad8216897134970ce95595ed07db5366d3c3fc351836015d43119c2e52d4c1f7a0017d70e78ce
-  languageName: node
-  linkType: hard
-
-"@react-pdf/image@npm:^2.3.6":
-  version: 2.3.6
-  resolution: "@react-pdf/image@npm:2.3.6"
-  dependencies:
-    "@babel/runtime": "npm:^7.20.13"
-    "@react-pdf/png-js": "npm:^2.3.1"
-    cross-fetch: "npm:^3.1.5"
-    jay-peg: "npm:^1.0.2"
-  checksum: 10/3b1a686072bffda143cf22e0b536f3c7cda0972341897aa80dadce8254f2c35911e52a8202386d17282594b84cecf31622317606acec77aa7aca71d8634b6d6f
+  checksum: 10/9f81bc5c2d48d290a59019a0de3b4d7fc30efcc3331816e463f39a81398adb0ba91413d0c5e73007384c30ffd9e34a4380cadc2944cafa0a187dcc2201974326
   languageName: node
   linkType: hard
 
-"@react-pdf/image@npm:^3.0.4":
-  version: 3.0.4
-  resolution: "@react-pdf/image@npm:3.0.4"
+"@react-pdf/image@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "@react-pdf/image@npm:3.1.0"
   dependencies:
-    "@react-pdf/png-js": "npm:^3.0.0"
+    "@react-pdf/svg": "npm:^1.1.0"
     jay-peg: "npm:^1.1.1"
-  checksum: 10/ab48ad5e118a567b2749ea2a7a8934d36968000782fa00885ec5ecfff218a383b0bb0ff7803a67a788e18579d4af88bde20a5510990875a68b525fbcf022bf17
+    png-js: "npm:^2.0.0"
+  checksum: 10/a0b1ac6a86b248e0e683abadf4b96735a838c24f8cc0f5b8cab8a2de6c9ad94777b8ce2f1e9144a3aa25e0e7db3e77b7c385219cc70e1266f74611a5bbb6cc3c
   languageName: node
   linkType: hard
 
-"@react-pdf/layout@npm:4.4.2":
-  version: 4.4.2
-  resolution: "@react-pdf/layout@npm:4.4.2"
-  dependencies:
-    "@react-pdf/fns": "npm:3.1.2"
-    "@react-pdf/image": "npm:^3.0.4"
-    "@react-pdf/primitives": "npm:^4.1.1"
-    "@react-pdf/stylesheet": "npm:^6.1.2"
-    "@react-pdf/textkit": "npm:^6.1.0"
-    "@react-pdf/types": "npm:^2.9.2"
+"@react-pdf/layout@npm:4.6.1":
+  version: 4.6.1
+  resolution: "@react-pdf/layout@npm:4.6.1"
+  dependencies:
+    "@react-pdf/fns": "npm:3.1.3"
+    "@react-pdf/image": "npm:^3.1.0"
+    "@react-pdf/primitives": "npm:^4.3.0"
+    "@react-pdf/stylesheet": "npm:^6.2.1"
+    "@react-pdf/textkit": "npm:^6.3.0"
+    "@react-pdf/types": "npm:^2.11.1"
     emoji-regex-xs: "npm:^1.0.0"
     queue: "npm:^6.0.1"
     yoga-layout: "npm:^3.2.1"
-  checksum: 10/778a3a648f585950e1a15a21252cf7da0ca133dddb4de746c66362a6ceeb827367e52d77c2cf14660459a8c29e5e4a3bc626b87507dd103e26e4cf32a946fdb5
+  checksum: 10/32b7ed4cfb4483e9609cb9b8f7ad4a6a221b7db8a21aef501591fc1658580ccec0aba35a26734a52f200526a0acaa7ac941fd271d3df8fb98f4193fc638893fe
   languageName: node
   linkType: hard
 
-"@react-pdf/layout@npm:^3.13.0":
-  version: 3.13.0
-  resolution: "@react-pdf/layout@npm:3.13.0"
+"@react-pdf/layout@patch:@react-pdf/layout@npm%3A4.6.1#~/.yarn/patches/@react-pdf-layout-npm-4.6.1-b12fdb71f4.patch":
+  version: 4.6.1
+  resolution: "@react-pdf/layout@patch:@react-pdf/layout@npm%3A4.6.1#~/.yarn/patches/@react-pdf-layout-npm-4.6.1-b12fdb71f4.patch::version=4.6.1&hash=2d4f47"
   dependencies:
-    "@babel/runtime": "npm:^7.20.13"
-    "@react-pdf/fns": "npm:2.2.1"
-    "@react-pdf/image": "npm:^2.3.6"
-    "@react-pdf/pdfkit": "npm:^3.2.0"
-    "@react-pdf/primitives": "npm:^3.1.1"
-    "@react-pdf/stylesheet": "npm:^4.3.0"
-    "@react-pdf/textkit": "npm:^4.4.1"
-    "@react-pdf/types": "npm:^2.6.0"
-    cross-fetch: "npm:^3.1.5"
-    emoji-regex: "npm:^10.3.0"
-    queue: "npm:^6.0.1"
-    yoga-layout: "npm:^2.0.1"
-  checksum: 10/4d497c5cf92b945d49a56d3db1afb5f1c07bcbc11d617a96c64e008e6dfdbfa956d885ef7a5be98ac7e900768cfd88d8c5950cee6f2c80eb2bc7723d54a97d06
-  languageName: node
-  linkType: hard
-
-"@react-pdf/layout@patch:@react-pdf/layout@npm%3A4.4.2#~/.yarn/patches/@react-pdf-layout-npm-4.4.2-6c2e3312fa.patch":
-  version: 4.4.2
-  resolution: "@react-pdf/layout@patch:@react-pdf/layout@npm%3A4.4.2#~/.yarn/patches/@react-pdf-layout-npm-4.4.2-6c2e3312fa.patch::version=4.4.2&hash=9b0b74"
-  dependencies:
-    "@react-pdf/fns": "npm:3.1.2"
-    "@react-pdf/image": "npm:^3.0.4"
-    "@react-pdf/primitives": "npm:^4.1.1"
-    "@react-pdf/stylesheet": "npm:^6.1.2"
-    "@react-pdf/textkit": "npm:^6.1.0"
-    "@react-pdf/types": "npm:^2.9.2"
+    "@react-pdf/fns": "npm:3.1.3"
+    "@react-pdf/image": "npm:^3.1.0"
+    "@react-pdf/primitives": "npm:^4.3.0"
+    "@react-pdf/stylesheet": "npm:^6.2.1"
+    "@react-pdf/textkit": "npm:^6.3.0"
+    "@react-pdf/types": "npm:^2.11.1"
     emoji-regex-xs: "npm:^1.0.0"
     queue: "npm:^6.0.1"
     yoga-layout: "npm:^3.2.1"
-  checksum: 10/6d74ee049858de5cc04a7ef31d32e0ec9259173adbd35479480994495fa5f1031da7ef4637267d10e8be4101ba78f0cb3587289f67130bee45eff7129b35fb45
+  checksum: 10/acbdd82dd5b25ba44676604825c773df43f91e06bcba481524928a535f86f78016ed365e627472347c0db1b5e3ba6d81c52ec9a4324d178a09854441c7496b90
   languageName: node
   linkType: hard
 
-"@react-pdf/pdfkit@npm:^3.2.0":
-  version: 3.2.0
-  resolution: "@react-pdf/pdfkit@npm:3.2.0"
-  dependencies:
-    "@babel/runtime": "npm:^7.20.13"
-    "@react-pdf/png-js": "npm:^2.3.1"
-    browserify-zlib: "npm:^0.2.0"
-    crypto-js: "npm:^4.2.0"
-    fontkit: "npm:^2.0.2"
-    jay-peg: "npm:^1.0.2"
-    vite-compatible-readable-stream: "npm:^3.6.1"
-  checksum: 10/5fa01f1365b5df119e5bd63f3fbbae99c67926fec1595376907551ce2c16a6cad0231492bf9c21b2b57ce4a0bc5f52fafae0fee008419fdfc4e6d91932479259
-  languageName: node
-  linkType: hard
-
-"@react-pdf/pdfkit@npm:^4.1.0":
-  version: 4.1.0
-  resolution: "@react-pdf/pdfkit@npm:4.1.0"
+"@react-pdf/pdfkit@npm:^5.1.1":
+  version: 5.1.1
+  resolution: "@react-pdf/pdfkit@npm:5.1.1"
   dependencies:
     "@babel/runtime": "npm:^7.20.13"
-    "@react-pdf/png-js": "npm:^3.0.0"
+    "@noble/ciphers": "npm:^1.0.0"
+    "@noble/hashes": "npm:^1.6.0"
     browserify-zlib: "npm:^0.2.0"
-    crypto-js: "npm:^4.2.0"
     fontkit: "npm:^2.0.2"
     jay-peg: "npm:^1.1.1"
+    js-md5: "npm:^0.8.3"
     linebreak: "npm:^1.1.0"
+    png-js: "npm:^2.0.0"
     vite-compatible-readable-stream: "npm:^3.6.1"
-  checksum: 10/7dae027f3e124f50a2800c3672efa80d599e79cae445c6046dd2a33511254eb6069dfbd9a6083f1e4578fe8d1f20c68aec23f2e2f82b534f2eb355f897d920e2
-  languageName: node
-  linkType: hard
-
-"@react-pdf/png-js@npm:^2.3.1":
-  version: 2.3.1
-  resolution: "@react-pdf/png-js@npm:2.3.1"
-  dependencies:
-    browserify-zlib: "npm:^0.2.0"
-  checksum: 10/0f4de5c1654ac8d12a44b36d2316fd9c54b1a7647a00953b268610848778a83437dce0e5d0c21902b63a2e2e8d4b4503d689f765316ad1dd679d8c92c6c228f2
-  languageName: node
-  linkType: hard
-
-"@react-pdf/png-js@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@react-pdf/png-js@npm:3.0.0"
-  dependencies:
-    browserify-zlib: "npm:^0.2.0"
-  checksum: 10/5e972302a5d93f67d3dc1438bb4cb8ee708802fb6d513b651aa0857909a185f06e5288b59e82cffa9fe5587289c97de7f5c5401101f50faebc32bef50f398ee5
-  languageName: node
-  linkType: hard
-
-"@react-pdf/primitives@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "@react-pdf/primitives@npm:3.1.1"
-  checksum: 10/a52c0cfff74d29d36e2e4c1c2b8935faf2f13bbe3800901e93354ea044385d8716166e45f3a49bb729e6d9944d7a8239056f5af80b345cb2984e245b2e719c1d
+  checksum: 10/52ff3e9a33d8048bda696200811e1f38a75c440d61b6558dd5af66f7df1677839b328d500cf848f3fde0f203d7ab0cfc4331b495568532fcc95ea32d72feee8e
   languageName: node
   linkType: hard
 
-"@react-pdf/primitives@npm:^4.1.1":
-  version: 4.1.1
-  resolution: "@react-pdf/primitives@npm:4.1.1"
-  checksum: 10/adadff1996daeca693aa59844ab613e597fdb674fce9f2c03f52573b593982ef49ff47d861290235861d02462ffbc87b7ed3da0d71af0d61c9226ce61b94ada8
+"@react-pdf/primitives@npm:^4.3.0":
+  version: 4.3.0
+  resolution: "@react-pdf/primitives@npm:4.3.0"
+  checksum: 10/391f48e09a9b13eb72f763398a792b59484637023afe1e19fba7b4bafde339af87b0d9142d50c0dcf980a81851f92f772fd27ce678af08c16552524da79e4f1b
   languageName: node
   linkType: hard
 
@@ -7855,149 +7771,90 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@react-pdf/render@npm:^3.5.0":
-  version: 3.5.0
-  resolution: "@react-pdf/render@npm:3.5.0"
-  dependencies:
-    "@babel/runtime": "npm:^7.20.13"
-    "@react-pdf/fns": "npm:2.2.1"
-    "@react-pdf/primitives": "npm:^3.1.1"
-    "@react-pdf/textkit": "npm:^4.4.1"
-    "@react-pdf/types": "npm:^2.6.0"
-    abs-svg-path: "npm:^0.1.1"
-    color-string: "npm:^1.9.1"
-    normalize-svg-path: "npm:^1.1.0"
-    parse-svg-path: "npm:^0.1.2"
-    svg-arc-to-cubic-bezier: "npm:^3.2.0"
-  checksum: 10/0fa434449e69fa5f64dfa6677bd1f14e11e20940640a6847b7435db17698cd4ef1bc8a49e71f221cd6a217032535190c9895a9bdbf10dda16d9a114dcd1f84f2
-  languageName: node
-  linkType: hard
-
-"@react-pdf/render@npm:^4.3.2":
-  version: 4.3.2
-  resolution: "@react-pdf/render@npm:4.3.2"
+"@react-pdf/render@npm:^4.5.1":
+  version: 4.5.1
+  resolution: "@react-pdf/render@npm:4.5.1"
   dependencies:
     "@babel/runtime": "npm:^7.20.13"
-    "@react-pdf/fns": "npm:3.1.2"
-    "@react-pdf/primitives": "npm:^4.1.1"
-    "@react-pdf/textkit": "npm:^6.1.0"
-    "@react-pdf/types": "npm:^2.9.2"
+    "@react-pdf/fns": "npm:3.1.3"
+    "@react-pdf/primitives": "npm:^4.3.0"
+    "@react-pdf/textkit": "npm:^6.3.0"
+    "@react-pdf/types": "npm:^2.11.1"
     abs-svg-path: "npm:^0.1.1"
-    color-string: "npm:^1.9.1"
+    color-string: "npm:^2.1.4"
     normalize-svg-path: "npm:^1.1.0"
     parse-svg-path: "npm:^0.1.2"
     svg-arc-to-cubic-bezier: "npm:^3.2.0"
-  checksum: 10/2b4f36b7dfa8cef232bf13add469516b12f366fa2681b50486af69655511693e4201601d8a6cf9943fdd1d3597f71f75dfb9d4954fa80d629f45e38954820fbd
+  checksum: 10/90498cf5e6fcf094050855ceb881a052d5caf6b774effcf4e824ef9bd5d7c45c0add339b4a6225c6eb0d489d16b994a95acfbc3ce2dcd79a051c1ff80fb75651
   languageName: node
   linkType: hard
 
-"@react-pdf/renderer@npm:^3.4.5":
-  version: 3.4.5
-  resolution: "@react-pdf/renderer@npm:3.4.5"
+"@react-pdf/renderer@npm:~4.5.1":
+  version: 4.5.1
+  resolution: "@react-pdf/renderer@npm:4.5.1"
   dependencies:
     "@babel/runtime": "npm:^7.20.13"
-    "@react-pdf/font": "npm:^2.5.2"
-    "@react-pdf/layout": "npm:^3.13.0"
-    "@react-pdf/pdfkit": "npm:^3.2.0"
-    "@react-pdf/primitives": "npm:^3.1.1"
-    "@react-pdf/render": "npm:^3.5.0"
-    "@react-pdf/types": "npm:^2.6.0"
-    events: "npm:^3.3.0"
-    object-assign: "npm:^4.1.1"
-    prop-types: "npm:^15.6.2"
-    queue: "npm:^6.0.1"
-    scheduler: "npm:^0.17.0"
-  peerDependencies:
-    react: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 10/eb940e2d05dd986fad827f4cde956a556d4c60a9ab9e182b993c13cab9962e1959804c2cd247832d335bab27b2bb7db3d9e253a7f6f18c526c1422b5b44b09c3
-  languageName: node
-  linkType: hard
-
-"@react-pdf/renderer@npm:^4.3.2":
-  version: 4.3.2
-  resolution: "@react-pdf/renderer@npm:4.3.2"
-  dependencies:
-    "@babel/runtime": "npm:^7.20.13"
-    "@react-pdf/fns": "npm:3.1.2"
-    "@react-pdf/font": "npm:^4.0.4"
-    "@react-pdf/layout": "npm:^4.4.2"
-    "@react-pdf/pdfkit": "npm:^4.1.0"
-    "@react-pdf/primitives": "npm:^4.1.1"
+    "@react-pdf/fns": "npm:3.1.3"
+    "@react-pdf/font": "npm:^4.0.8"
+    "@react-pdf/layout": "npm:^4.6.1"
+    "@react-pdf/pdfkit": "npm:^5.1.1"
+    "@react-pdf/primitives": "npm:^4.3.0"
     "@react-pdf/reconciler": "npm:^2.0.0"
-    "@react-pdf/render": "npm:^4.3.2"
-    "@react-pdf/types": "npm:^2.9.2"
+    "@react-pdf/render": "npm:^4.5.1"
+    "@react-pdf/types": "npm:^2.11.1"
     events: "npm:^3.3.0"
     object-assign: "npm:^4.1.1"
     prop-types: "npm:^15.6.2"
     queue: "npm:^6.0.1"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
-  checksum: 10/8b4013d84e44c8606c1c5298da01e987b4781bfc0f05c38a42cd5d361d189eb93c4b5fb3d6e011dc8d7f5e7b5b4c4def0b00449e6b3dc6aaad59bdf5e9d299e1
-  languageName: node
-  linkType: hard
-
-"@react-pdf/stylesheet@npm:^4.3.0":
-  version: 4.3.0
-  resolution: "@react-pdf/stylesheet@npm:4.3.0"
-  dependencies:
-    "@babel/runtime": "npm:^7.20.13"
-    "@react-pdf/fns": "npm:2.2.1"
-    "@react-pdf/types": "npm:^2.6.0"
-    color-string: "npm:^1.9.1"
-    hsl-to-hex: "npm:^1.0.0"
-    media-engine: "npm:^1.0.3"
-    postcss-value-parser: "npm:^4.1.0"
-  checksum: 10/ca012d7f63676a85e11df00da814a75fd50d0b731b7bc10896e64cc5740df02080c40d21ea903ad9fd071a431987ce53ee2779f22b26ae36e72bbde283f41a37
+  checksum: 10/a8ee9d95be6c06ac5db70d99135829094379aee92f515cf37415ffcf291c50aa7f2af16ddb5880d09c908669a2d00225f75127a3a32b7cc48489c311efa1d23c
   languageName: node
   linkType: hard
 
-"@react-pdf/stylesheet@npm:^6.1.2":
-  version: 6.1.2
-  resolution: "@react-pdf/stylesheet@npm:6.1.2"
+"@react-pdf/stylesheet@npm:^6.2.1":
+  version: 6.2.1
+  resolution: "@react-pdf/stylesheet@npm:6.2.1"
   dependencies:
-    "@react-pdf/fns": "npm:3.1.2"
-    "@react-pdf/types": "npm:^2.9.2"
-    color-string: "npm:^1.9.1"
+    "@react-pdf/fns": "npm:3.1.3"
+    "@react-pdf/types": "npm:^2.11.1"
+    color-string: "npm:^2.1.4"
     hsl-to-hex: "npm:^1.0.0"
     media-engine: "npm:^1.0.3"
     postcss-value-parser: "npm:^4.1.0"
-  checksum: 10/ca0a12e121fa646faf7bad6355545b34ca2e2638ffb60ef04b5779fede18e7ea442afa2886d3a3a0333770ea013f0796b1287eba846312427745a7e755a40ed5
+  checksum: 10/d54187ead9718eea92ca88f192613db4946cd144e6c4eb27b879ddb283082b8a6f477e73f89d774acc1b442a3ac96d5d9e16269dc17facafeae19887348a24d8
   languageName: node
   linkType: hard
 
-"@react-pdf/textkit@npm:^4.4.1":
-  version: 4.4.1
-  resolution: "@react-pdf/textkit@npm:4.4.1"
+"@react-pdf/svg@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "@react-pdf/svg@npm:1.1.0"
   dependencies:
-    "@babel/runtime": "npm:^7.20.13"
-    "@react-pdf/fns": "npm:2.2.1"
-    bidi-js: "npm:^1.0.2"
-    hyphen: "npm:^1.6.4"
-    unicode-properties: "npm:^1.4.1"
-  checksum: 10/36c30514034367398382d822c2422fb64ea26f2350230073e9ff461c2a27d237d279b9264140d8399d3d92a5c3167bfd258f91eca475fa45a67999006ccc3139
+    "@react-pdf/primitives": "npm:^4.3.0"
+  checksum: 10/6447f76c309ba95c2d2d46410e5bedbba2fa4a8d2b53071ce099a32165395885e44bc96c9717fb0dd71f858cd53f895a6463322f9c3cd39732be32c530af7bbf
   languageName: node
   linkType: hard
 
-"@react-pdf/textkit@npm:^6.1.0":
-  version: 6.1.0
-  resolution: "@react-pdf/textkit@npm:6.1.0"
+"@react-pdf/textkit@npm:^6.3.0":
+  version: 6.3.0
+  resolution: "@react-pdf/textkit@npm:6.3.0"
   dependencies:
-    "@react-pdf/fns": "npm:3.1.2"
+    "@react-pdf/fns": "npm:3.1.3"
     bidi-js: "npm:^1.0.2"
     hyphen: "npm:^1.6.4"
     unicode-properties: "npm:^1.4.1"
-  checksum: 10/4f7333cb4dbb5eb057c6241376d4155675104eb6bda19ac5e756d9d5330bf1c4bdeb0fa9ba4eeb2b449f04616b3e7c41db74dba2d17f60a0405a4d76fefc418d
+  checksum: 10/48e6fac758e0061dd055c65c06721dc5c0b503695b09780767356c01c55ee242a0d19f75a53d129e90c422742def9292d960aef7f31d189c82987f1580e712b7
   languageName: node
   linkType: hard
 
-"@react-pdf/types@npm:^2.6.0, @react-pdf/types@npm:^2.9.2":
-  version: 2.9.2
-  resolution: "@react-pdf/types@npm:2.9.2"
+"@react-pdf/types@npm:^2.11.1":
+  version: 2.11.1
+  resolution: "@react-pdf/types@npm:2.11.1"
   dependencies:
-    "@react-pdf/font": "npm:^4.0.4"
-    "@react-pdf/primitives": "npm:^4.1.1"
-    "@react-pdf/stylesheet": "npm:^6.1.2"
-  checksum: 10/c3a6184d806e6b8f8f51bf6c31cec95a668fbf092329fef0043dbe6879162fe09451da7fb5bed71f6fef839c700c0d4aef9f12ae07ecadf8792c9e07d62eb28f
+    "@react-pdf/font": "npm:^4.0.8"
+    "@react-pdf/primitives": "npm:^4.3.0"
+    "@react-pdf/stylesheet": "npm:^6.2.1"
+  checksum: 10/06ee8962012751c0ba48d89cf5c8fba7ad55875d1b27fd098f1bed2fe0f38a77bfed2ae5f9ee9a05cecb492e6e1ce23672fde2152fe3ab023bdf42ac8773f742
   languageName: node
   linkType: hard
 
@@ -9913,7 +9770,7 @@ __metadata:
     "@parse/node-apn": "npm:^8.1.0"
     "@playwright/test": "npm:~1.52.0"
     "@react-aria/toolbar": "npm:^3.0.0-nightly.5042"
-    "@react-pdf/renderer": "npm:^4.3.2"
+    "@react-pdf/renderer": "npm:~4.5.1"
     "@rocket.chat/abac": "workspace:^"
     "@rocket.chat/account-utils": "workspace:^"
     "@rocket.chat/agenda": "workspace:^"
@@ -10461,7 +10318,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/omnichannel-transcript@workspace:ee/apps/omnichannel-transcript"
   dependencies:
-    "@react-pdf/renderer": "npm:^3.4.5"
+    "@react-pdf/renderer": "npm:~4.5.1"
     "@rocket.chat/core-services": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/emitter": "npm:^0.32.0"
@@ -10552,7 +10409,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/pdf-worker@workspace:ee/packages/pdf-worker"
   dependencies:
-    "@react-pdf/renderer": "npm:^3.4.5"
+    "@react-pdf/renderer": "npm:~4.5.1"
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/fuselage-tokens": "npm:~0.33.2"
     "@rocket.chat/jest-presets": "workspace:~"
@@ -18468,7 +18325,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"color-string@npm:^1.9.0, color-string@npm:^1.9.1":
+"color-name@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "color-name@npm:2.1.0"
+  checksum: 10/eb014f71d87408e318e95d3f554f188370d354ba8e0ffa4341d0fd19de391bfe2bc96e563d4f6614644d676bc24f475560dffee3fe310c2d6865d007410a9a2b
+  languageName: node
+  linkType: hard
+
+"color-string@npm:^1.9.0":
   version: 1.9.1
   resolution: "color-string@npm:1.9.1"
   dependencies:
@@ -18478,6 +18342,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"color-string@npm:^2.1.4":
+  version: 2.1.4
+  resolution: "color-string@npm:2.1.4"
+  dependencies:
+    color-name: "npm:^2.0.0"
+  checksum: 10/689a8688ac3cd55247792c83a9db9bfe675343c7412fedba1eb748ac6a8867dd2bb3d406e309ebfe90336809ee5067c7f2cccfbd10133c5cc9ef1dba5aad58f2
+  languageName: node
+  linkType: hard
+
 "color-support@npm:^1.1.2":
   version: 1.1.3
   resolution: "color-support@npm:1.1.3"
@@ -19017,15 +18890,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cross-fetch@npm:^3.1.5":
-  version: 3.2.0
-  resolution: "cross-fetch@npm:3.2.0"
-  dependencies:
-    node-fetch: "npm:^2.7.0"
-  checksum: 10/e4ab1d390a5b6ca8bb0605f028af2ffc1127d2e407b954654949f506d04873c4863ece264662c074865d7874060e35f938cec74fe7b5736d46d545e2685f6aec
-  languageName: node
-  linkType: hard
-
 "cross-spawn@npm:7.0.6":
   version: 7.0.6
   resolution: "cross-spawn@npm:7.0.6"
@@ -19044,13 +18908,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"crypto-js@npm:^4.2.0":
-  version: 4.2.0
-  resolution: "crypto-js@npm:4.2.0"
-  checksum: 10/c7bcc56a6e01c3c397e95aa4a74e4241321f04677f9a618a8f48a63b5781617248afb9adb0629824792e7ec20ca0d4241a49b6b2938ae6f973ec4efc5c53c924
-  languageName: node
-  linkType: hard
-
 "css-box-model@npm:^1.2.1":
   version: 1.2.1
   resolution: "css-box-model@npm:1.2.1"
@@ -20566,13 +20423,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"emoji-regex@npm:^10.3.0":
-  version: 10.6.0
-  resolution: "emoji-regex@npm:10.6.0"
-  checksum: 10/98cc0b0e1daed1ed25afbf69dcb921fee00f712f51aab93aa1547e4e4e8171725cc4f0098aaa645b4f611a19da11ec9f4623eb6ff2b72314b39a8f2ae7c12bf2
-  languageName: node
-  linkType: hard
-
 "emoji-regex@npm:^8.0.0":
   version: 8.0.0
   resolution: "emoji-regex@npm:8.0.0"
@@ -25113,7 +24963,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jay-peg@npm:^1.0.2, jay-peg@npm:^1.1.1":
+"jay-peg@npm:^1.1.1":
   version: 1.1.1
   resolution: "jay-peg@npm:1.1.1"
   dependencies:
@@ -26251,6 +26101,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"js-md5@npm:^0.8.3":
+  version: 0.8.3
+  resolution: "js-md5@npm:0.8.3"
+  checksum: 10/2f74961bb21293cc4e023685985b531748da88c5e57fd4ef96d1d292e0918c09a4b192c425520c0aea6988190e9694c2e38ed34f7907a908614e6b133095f882
+  languageName: node
+  linkType: hard
+
 "js-tokens@npm:^3.0.0 || ^4.0.0, js-tokens@npm:^4.0.0":
   version: 4.0.0
   resolution: "js-tokens@npm:4.0.0"
@@ -27287,7 +27144,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"loose-envify@npm:^1.0.0, loose-envify@npm:^1.1.0, loose-envify@npm:^1.4.0":
+"loose-envify@npm:^1.0.0, loose-envify@npm:^1.4.0":
   version: 1.4.0
   resolution: "loose-envify@npm:1.4.0"
   dependencies:
@@ -30276,6 +30133,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"png-js@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "png-js@npm:2.0.0"
+  dependencies:
+    fflate: "npm:^0.8.2"
+  checksum: 10/33f19a521cdd9362fd5d46d0f7477e683dc4f50f8c0d030b3998fa4d1b67dfbb34c8f64e92e6f3cf68d542eeffb14bd1e3d225b5731e906e1981c4e52be63ffb
+  languageName: node
+  linkType: hard
+
 "polka@npm:^0.5.2":
   version: 0.5.2
   resolution: "polka@npm:0.5.2"
@@ -33291,16 +33157,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"scheduler@npm:^0.17.0":
-  version: 0.17.0
-  resolution: "scheduler@npm:0.17.0"
-  dependencies:
-    loose-envify: "npm:^1.1.0"
-    object-assign: "npm:^4.1.1"
-  checksum: 10/7fcf855eb30307cd0a04dc1feee313e1a68ac272497c4a82265d9139ebdeb7a00319c82d57f73f275fe55993a12b0683ab0d20735949580008da5a0e222c547d
-  languageName: node
-  linkType: hard
-
 "scheduler@npm:^0.25.0":
   version: 0.25.0
   resolution: "scheduler@npm:0.25.0"
@@ -37835,13 +37691,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yoga-layout@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "yoga-layout@npm:2.0.1"
-  checksum: 10/f8f6bb2219b6225105f57d88001eeb0909b7e205a6f8e6acae79ef09f1233da4210bc5185c0997f2f0ab42bc21d9fb723c90d2b0b05d078ba542a3a2f0ae6e92
-  languageName: node
-  linkType: hard
-
 "yoga-layout@patch:yoga-layout@npm%3A3.2.1#~/.yarn/patches/yoga-layout-npm-3.2.1-51ec934670.patch":
   version: 3.2.1
   resolution: "yoga-layout@patch:yoga-layout@npm%3A3.2.1#~/.yarn/patches/yoga-layout-npm-3.2.1-51ec934670.patch::version=3.2.1&hash=bcf792"

From 7b73f1a57b24411ece3452daf08eba862bb6628c Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso.evangelista@rocket.chat>
Date: Fri, 26 Jun 2026 23:47:00 -0300
Subject: [PATCH 5/8] test(e2e): wait for lazy room toolbar

---
 apps/meteor/tests/e2e/messaging.spec.ts       | 98 +++++++++----------
 .../e2e/page-objects/fragments/toolbar.ts     |  4 +
 2 files changed, 53 insertions(+), 49 deletions(-)

diff --git a/apps/meteor/tests/e2e/messaging.spec.ts b/apps/meteor/tests/e2e/messaging.spec.ts
index f17720d3ba56b..b862952a48a4f 100644
--- a/apps/meteor/tests/e2e/messaging.spec.ts
+++ b/apps/meteor/tests/e2e/messaging.spec.ts
@@ -10,7 +10,7 @@ import { expect, test } from './utils/test';
 test.use({ storageState: Users.user1.state });
 
 test.describe('Messaging', () => {
-	let poHomeChannel: HomeChannel;
+	let channelPage: HomeChannel;
 	let targetChannel: string;
 
 	test.beforeAll(async ({ api }) => {
@@ -18,7 +18,7 @@ test.describe('Messaging', () => {
 	});
 
 	test.beforeEach(async ({ page }) => {
-		poHomeChannel = new HomeChannel(page);
+		channelPage = new HomeChannel(page);
 		await page.goto('/home');
 	});
 
@@ -27,27 +27,32 @@ test.describe('Messaging', () => {
 	});
 
 	test.describe.serial('Navigation', () => {
+		test.beforeEach(async () => {
+			await channelPage.navbar.openChat(targetChannel);
+			// wait for the room toolbox to mount, since it's a lazy loaded component
+			await channelPage.roomToolbar.waitFor();
+		});
+
 		test('should navigate on messages using keyboard', async ({ page }) => {
 			await test.step('open chat and send message', async () => {
-				await poHomeChannel.navbar.openChat(targetChannel);
-				await poHomeChannel.content.sendMessage('msg1');
-				await poHomeChannel.content.sendMessage('msg2');
+				await channelPage.content.sendMessage('msg1');
+				await channelPage.content.sendMessage('msg2');
 			});
 
 			await test.step('move focus to the second message', async () => {
 				await page.keyboard.press('Shift+Tab');
-				await expect(poHomeChannel.content.lastUserMessage).toBeFocused();
+				await expect(channelPage.content.lastUserMessage).toBeFocused();
 			});
 
 			await test.step('move focus to the first system message', async () => {
 				await page.keyboard.press('ArrowUp');
 				await page.keyboard.press('ArrowUp');
-				await expect(poHomeChannel.content.systemMessageListItems.first()).toBeFocused();
+				await expect(channelPage.content.systemMessageListItems.first()).toBeFocused();
 			});
 
 			await test.step('move focus to the first typed message', async () => {
 				await page.keyboard.press('ArrowDown');
-				await expect(poHomeChannel.content.getMessageByText('msg1')).toBeFocused();
+				await expect(channelPage.content.getMessageByText('msg1')).toBeFocused();
 			});
 
 			await test.step('move focus to the room title', async () => {
@@ -59,11 +64,11 @@ test.describe('Messaging', () => {
 				await page.keyboard.press('Tab');
 				await page.keyboard.press('Tab');
 				await page.keyboard.press('Tab');
-				await expect(poHomeChannel.content.getMessageByText('msg1')).toBeFocused();
+				await expect(channelPage.content.getMessageByText('msg1')).toBeFocused();
 			});
 
 			await test.step('move focus to the message toolbar', async () => {
-				await poHomeChannel.content
+				await channelPage.content
 					.getMessageByText('msg1')
 					.locator('[role=toolbar][aria-label="Message actions"]')
 					.getByRole('button', { name: 'Add reaction' })
@@ -72,7 +77,7 @@ test.describe('Messaging', () => {
 				await page.keyboard.press('Tab');
 				await page.keyboard.press('Tab');
 				await expect(
-					poHomeChannel.content
+					channelPage.content
 						.getMessageByText('msg1')
 						.locator('[role=toolbar][aria-label="Message actions"]')
 						.getByRole('button', { name: 'Add reaction' }),
@@ -81,36 +86,34 @@ test.describe('Messaging', () => {
 
 			await test.step('move focus to the composer', async () => {
 				await page.keyboard.press('Tab');
-				await poHomeChannel.content
+				await channelPage.content
 					.getMessageByText('msg2')
 					.locator('[role=toolbar][aria-label="Message actions"]')
 					.getByRole('button', { name: 'Add reaction' })
 					.waitFor();
 				await page.keyboard.press('Tab');
 				await page.keyboard.press('Tab');
-				await expect(poHomeChannel.composer.inputMessage).toBeFocused();
+				await expect(channelPage.composer.inputMessage).toBeFocused();
 			});
 		});
 
 		test('should navigate properly on the user card', async ({ page }) => {
-			await poHomeChannel.navbar.openChat(targetChannel);
-
 			await test.step('open UserCard', async () => {
 				await page.keyboard.press('Shift+Tab');
 				await page.keyboard.press('ArrowUp');
 				await page.keyboard.press('Tab');
 				await page.keyboard.press('Space');
-				await expect(poHomeChannel.userCardToolbar).toBeVisible();
+				await expect(channelPage.userCardToolbar).toBeVisible();
 			});
 
 			await test.step('close UserCard with Esc', async () => {
 				await page.keyboard.press('Escape');
-				await expect(poHomeChannel.userCardToolbar).not.toBeVisible();
+				await expect(channelPage.userCardToolbar).not.toBeVisible();
 			});
 
 			await test.step('with focus restored reopen toolbar', async () => {
 				await page.keyboard.press('Space');
-				await expect(poHomeChannel.userCardToolbar).toBeVisible();
+				await expect(channelPage.userCardToolbar).toBeVisible();
 			});
 
 			await test.step('close UserCard with button', async () => {
@@ -118,36 +121,33 @@ test.describe('Messaging', () => {
 				await page.keyboard.press('Tab');
 				await page.keyboard.press('Tab');
 				await page.keyboard.press('Space');
-				await expect(poHomeChannel.userCardToolbar).not.toBeVisible();
+				await expect(channelPage.userCardToolbar).not.toBeVisible();
 			});
 		});
 
 		test('should not restore focus on the last focused if it was triggered by click', async ({ page }) => {
-			await poHomeChannel.navbar.openChat(targetChannel);
-			await poHomeChannel.content.getMessageByText('msg1').click();
+			await channelPage.content.getMessageByText('msg1').click();
 
-			await poHomeChannel.composer.inputMessage.click();
+			await channelPage.composer.inputMessage.click();
 			await page.keyboard.press('Shift+Tab');
 
-			await expect(poHomeChannel.content.getMessageByText('msg2')).toBeFocused();
+			await expect(channelPage.content.getMessageByText('msg2')).toBeFocused();
 		});
 
 		test('should not focus on the last message when focusing by click', async () => {
-			await poHomeChannel.navbar.openChat(targetChannel);
-			await poHomeChannel.content.getMessageByText('msg1').click();
+			await channelPage.content.getMessageByText('msg1').click();
 
-			await expect(poHomeChannel.content.lastUserMessage).not.toBeFocused();
+			await expect(channelPage.content.lastUserMessage).not.toBeFocused();
 		});
 
 		test('should focus the latest message when moving the focus on the list and theres no previous focus', async ({ page }) => {
-			await poHomeChannel.navbar.openChat(targetChannel);
 			await page.getByRole('button', { name: targetChannel }).first().focus();
 
 			await test.step('move focus to the list', async () => {
 				await page.keyboard.press('Tab');
 				await page.keyboard.press('Tab');
 				await page.keyboard.press('Tab');
-				await expect(poHomeChannel.content.lastUserMessage).toBeFocused();
+				await expect(channelPage.content.lastUserMessage).toBeFocused();
 			});
 
 			await test.step('move focus to the list again', async () => {
@@ -155,19 +155,19 @@ test.describe('Messaging', () => {
 				await page.keyboard.press('Tab');
 				await page.keyboard.press('Tab');
 				await page.keyboard.press('Tab');
-				await expect(poHomeChannel.content.lastUserMessage).toBeFocused();
+				await expect(channelPage.content.lastUserMessage).toBeFocused();
 			});
 		});
 	});
 
 	test.describe.serial('Message edition', () => {
 		test('should edit messages', async ({ page }) => {
-			await poHomeChannel.navbar.openChat(targetChannel);
+			await channelPage.navbar.openChat(targetChannel);
 
 			await test.step('focus on the second message', async () => {
 				await page.keyboard.press('ArrowUp');
 
-				expect(await poHomeChannel.composer.inputMessage.inputValue()).toBe('msg2');
+				expect(await channelPage.composer.inputMessage.inputValue()).toBe('msg2');
 			});
 
 			await test.step('send edited message', async () => {
@@ -175,10 +175,10 @@ test.describe('Messaging', () => {
 					(response) => /api\/v1\/chat.update/.test(response.url()) && response.status() === 200 && response.request().method() === 'POST',
 				);
 
-				await poHomeChannel.content.sendMessage('edited msg2', false);
+				await channelPage.content.sendMessage('edited msg2', false);
 				await editPromise;
 
-				await expect(poHomeChannel.content.lastUserMessageBody).toHaveText('edited msg2');
+				await expect(channelPage.content.lastUserMessageBody).toHaveText('edited msg2');
 			});
 
 			await test.step('stress test on message editions', async () => {
@@ -189,11 +189,11 @@ test.describe('Messaging', () => {
 				for (const element of ['edited msg2 a', 'edited msg2 b', 'edited msg2 c', 'edited msg2 d', 'edited msg2 e']) {
 					await page.keyboard.press('ArrowUp');
 
-					await poHomeChannel.content.sendMessage(element, false);
+					await channelPage.content.sendMessage(element, false);
 				}
 
 				await editPromise;
-				await expect(poHomeChannel.content.lastUserMessageBody).toHaveText('edited msg2 e');
+				await expect(channelPage.content.lastUserMessageBody).toHaveText('edited msg2 e');
 			});
 		});
 	});
@@ -202,21 +202,21 @@ test.describe('Messaging', () => {
 		test('expect show a message', async ({ api }) => {
 			const messageText = faker.lorem.sentence();
 
-			await poHomeChannel.navbar.openChat(targetChannel);
+			await channelPage.navbar.openChat(targetChannel);
 
 			await api.post('/chat.postMessage', {
 				channel: targetChannel,
 				text: messageText,
 			});
 
-			await expect(poHomeChannel.content.lastUserMessageBody).toHaveText(messageText);
+			await expect(channelPage.content.lastUserMessageBody).toHaveText(messageText);
 		});
 
 		test('expect show attachment text', async ({ api }) => {
 			const messageText = faker.lorem.sentence();
 			const attachmentText = faker.lorem.sentence();
 
-			await poHomeChannel.navbar.openChat(targetChannel);
+			await channelPage.navbar.openChat(targetChannel);
 
 			await api.post('/chat.postMessage', {
 				channel: targetChannel,
@@ -228,14 +228,14 @@ test.describe('Messaging', () => {
 				],
 			});
 
-			await expect(poHomeChannel.content.lastUserMessageAttachment).toHaveText(attachmentText);
+			await expect(channelPage.content.lastUserMessageAttachment).toHaveText(attachmentText);
 		});
 
 		test('expect show attachment text with emoji', async ({ api }) => {
 			const messageText = faker.lorem.sentence();
 			const attachmentText = faker.lorem.sentence();
 
-			await poHomeChannel.navbar.openChat(targetChannel);
+			await channelPage.navbar.openChat(targetChannel);
 
 			await api.post('/chat.postMessage', {
 				channel: targetChannel,
@@ -247,14 +247,14 @@ test.describe('Messaging', () => {
 				],
 			});
 
-			await expect(poHomeChannel.content.lastUserMessageAttachment).toHaveText(`${attachmentText} \ud83d\ude0e `);
+			await expect(channelPage.content.lastUserMessageAttachment).toHaveText(`${attachmentText} \ud83d\ude0e `);
 		});
 
 		test('expect show attachment text without emoji inside code block', async ({ api }) => {
 			const messageText = faker.lorem.sentence();
 			const attachmentText = faker.lorem.sentence();
 
-			await poHomeChannel.navbar.openChat(targetChannel);
+			await channelPage.navbar.openChat(targetChannel);
 
 			await api.post('/chat.postMessage', {
 				channel: targetChannel,
@@ -266,7 +266,7 @@ test.describe('Messaging', () => {
 				],
 			});
 
-			await expect(poHomeChannel.content.lastUserMessageAttachment).toHaveText(`${attachmentText} B) `);
+			await expect(channelPage.content.lastUserMessageAttachment).toHaveText(`${attachmentText} B) `);
 		});
 	});
 
@@ -282,26 +282,26 @@ test.describe('Messaging', () => {
 		});
 
 		test('expect show "hello word" in both contexts (targetChannel)', async () => {
-			await poHomeChannel.navbar.openChat(targetChannel);
+			await channelPage.navbar.openChat(targetChannel);
 
 			await auxContext.poHomeChannel.navbar.openChat(targetChannel);
 
-			await poHomeChannel.content.sendMessage('hello world');
+			await channelPage.content.sendMessage('hello world');
 
 			await expect(async () => {
 				await expect(auxContext.poHomeChannel.content.lastUserMessageBody).toHaveText('hello world');
-				await expect(poHomeChannel.content.lastUserMessageBody).toHaveText('hello world');
+				await expect(channelPage.content.lastUserMessageBody).toHaveText('hello world');
 			}).toPass();
 		});
 
 		test('expect show "hello word" in both contexts (direct)', async () => {
-			await poHomeChannel.navbar.openChat('user2');
+			await channelPage.navbar.openChat('user2');
 			await auxContext.poHomeChannel.navbar.openChat('user1');
 
-			await poHomeChannel.content.sendMessage('hello world');
+			await channelPage.content.sendMessage('hello world');
 
 			await expect(async () => {
-				await expect(poHomeChannel.content.lastUserMessageBody).toHaveText('hello world');
+				await expect(channelPage.content.lastUserMessageBody).toHaveText('hello world');
 				await expect(auxContext.poHomeChannel.content.lastUserMessageBody).toHaveText('hello world');
 			}).toPass();
 		});
diff --git a/apps/meteor/tests/e2e/page-objects/fragments/toolbar.ts b/apps/meteor/tests/e2e/page-objects/fragments/toolbar.ts
index 5548626412a4e..52974e4d91630 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/toolbar.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/toolbar.ts
@@ -122,6 +122,10 @@ export class RoomToolbar extends Toolbar {
 	async openTeamChannels() {
 		await this.btnTeamChannels.click();
 	}
+
+	async waitFor() {
+		await this.root.waitFor({ state: 'visible' });
+	}
 }
 
 export class TeamToolbar extends RoomToolbar {

From 934b32572db1c0f1d91469900e11cf16ff7bf71b Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso.evangelista@rocket.chat>
Date: Tue, 30 Jun 2026 00:47:14 -0300
Subject: [PATCH 6/8] chore(deps): upgrade `react-virtuoso`

---
 apps/meteor/package.json                  |  2 +-
 apps/uikit-playground/package.json        |  2 +-
 packages/fuselage-ui-kit/package.json     |  2 +-
 packages/gazzodown/package.json           |  2 +-
 packages/storybook-config/package.json    |  2 +-
 packages/ui-avatar/package.json           |  2 +-
 packages/ui-client/package.json           |  2 +-
 packages/ui-composer/package.json         |  2 +-
 packages/ui-contexts/package.json         |  2 +-
 packages/ui-video-conf/package.json       |  2 +-
 packages/ui-voip/package.json             |  2 +-
 packages/web-ui-registration/package.json |  2 +-
 yarn.lock                                 | 32 +++++++++++------------
 13 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index 901cf0bf91298..cbaa42e363d08 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -282,7 +282,7 @@
 		"react-is": "~19.2.7",
 		"react-keyed-flatten-children": "~5.1.2",
 		"react-stately": "~3.17.0",
-		"react-virtuoso": "~4.12.8",
+		"react-virtuoso": "~4.18.10",
 		"reflect-metadata": "^0.2.2",
 		"sanitize-html": "~2.17.4",
 		"semver": "^7.6.3",
diff --git a/apps/uikit-playground/package.json b/apps/uikit-playground/package.json
index 159ed3066ac55..4d1cc0bd00b8d 100644
--- a/apps/uikit-playground/package.json
+++ b/apps/uikit-playground/package.json
@@ -36,7 +36,7 @@
 		"react-dom": "~19.2.7",
 		"react-router-dom": "^6.30.4",
 		"react-split-pane": "^0.1.92",
-		"react-virtuoso": "~4.12.8",
+		"react-virtuoso": "~4.18.10",
 		"reactflow": "^11.11.4"
 	},
 	"devDependencies": {
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index fa036e585d891..94258f42c38c5 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -77,7 +77,7 @@
 		"react": "~19.2.7",
 		"react-dom": "~19.2.7",
 		"react-i18next": "~13.2.2",
-		"react-virtuoso": "~4.12.8",
+		"react-virtuoso": "~4.18.10",
 		"rimraf": "^6.0.1",
 		"storybook": "^9.1.13",
 		"typescript": "~5.9.3",
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index cac1fbe5d442d..767c1eebfb552 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -61,7 +61,7 @@
 		"react-aria": "~3.37.0",
 		"react-dom": "~19.2.7",
 		"react-i18next": "~13.2.2",
-		"react-virtuoso": "~4.12.8",
+		"react-virtuoso": "~4.18.10",
 		"storybook": "^9.1.13",
 		"typescript": "~5.9.3",
 		"webpack": "~5.104.1"
diff --git a/packages/storybook-config/package.json b/packages/storybook-config/package.json
index f856b15996208..4bd2a125db921 100644
--- a/packages/storybook-config/package.json
+++ b/packages/storybook-config/package.json
@@ -27,7 +27,7 @@
 		"@storybook/addon-styling-webpack": "^2.0.0",
 		"@storybook/addon-webpack5-compiler-swc": "^4.0.3",
 		"@storybook/react-webpack5": "^9.1.13",
-		"react-virtuoso": "~4.12.8",
+		"react-virtuoso": "~4.18.10",
 		"storybook": "^9.1.13",
 		"storybook-dark-mode": "^5.0.0",
 		"webpack": "~5.104.1"
diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json
index 29070d624de9f..0d46937c86b41 100644
--- a/packages/ui-avatar/package.json
+++ b/packages/ui-avatar/package.json
@@ -27,7 +27,7 @@
 		"eslint": "~9.39.4",
 		"react": "~19.2.7",
 		"react-dom": "~19.2.7",
-		"react-virtuoso": "~4.12.8",
+		"react-virtuoso": "~4.18.10",
 		"typescript": "~5.9.3"
 	},
 	"peerDependencies": {
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index b2ff4b2ca4661..0c5c142f1f014 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -56,7 +56,7 @@
 		"react-dom": "~19.2.7",
 		"react-hook-form": "~7.45.4",
 		"react-i18next": "~13.2.2",
-		"react-virtuoso": "~4.12.8",
+		"react-virtuoso": "~4.18.10",
 		"storybook": "^9.1.13",
 		"typescript": "~5.9.3"
 	},
diff --git a/packages/ui-composer/package.json b/packages/ui-composer/package.json
index 8ca87879ed39b..08add85797bd6 100644
--- a/packages/ui-composer/package.json
+++ b/packages/ui-composer/package.json
@@ -41,7 +41,7 @@
 		"jest": "~30.2.0",
 		"react": "~19.2.7",
 		"react-dom": "~19.2.7",
-		"react-virtuoso": "~4.12.8",
+		"react-virtuoso": "~4.18.10",
 		"storybook": "^9.1.13",
 		"typescript": "~5.9.3",
 		"webpack": "~5.104.1"
diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json
index 556f3ace7430a..6b24db4ea5824 100644
--- a/packages/ui-contexts/package.json
+++ b/packages/ui-contexts/package.json
@@ -40,7 +40,7 @@
 		"mongodb": "6.16.0",
 		"react": "~19.2.7",
 		"react-dom": "~19.2.7",
-		"react-virtuoso": "~4.12.8",
+		"react-virtuoso": "~4.18.10",
 		"typescript": "~5.9.3"
 	},
 	"peerDependencies": {
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index 9e94d0c9a0d01..fd1e6ec219411 100644
--- a/packages/ui-video-conf/package.json
+++ b/packages/ui-video-conf/package.json
@@ -42,7 +42,7 @@
 		"jest-axe": "~10.0.0",
 		"react": "~19.2.7",
 		"react-dom": "~19.2.7",
-		"react-virtuoso": "~4.12.8",
+		"react-virtuoso": "~4.18.10",
 		"storybook": "^9.1.13",
 		"typescript": "~5.9.3",
 		"webpack": "~5.104.1"
diff --git a/packages/ui-voip/package.json b/packages/ui-voip/package.json
index 6271f98e7e10e..379af54352b22 100644
--- a/packages/ui-voip/package.json
+++ b/packages/ui-voip/package.json
@@ -63,7 +63,7 @@
 		"jsdom": "^26.1.0",
 		"react": "~19.2.7",
 		"react-dom": "~19.2.7",
-		"react-virtuoso": "~4.12.8",
+		"react-virtuoso": "~4.18.10",
 		"storybook": "^9.1.13",
 		"typescript": "~5.9.3"
 	},
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index 2de1555ef16ee..6a303b2e04533 100644
--- a/packages/web-ui-registration/package.json
+++ b/packages/web-ui-registration/package.json
@@ -47,7 +47,7 @@
 		"react-dom": "~19.2.7",
 		"react-hook-form": "~7.45.4",
 		"react-i18next": "~13.2.2",
-		"react-virtuoso": "~4.12.8",
+		"react-virtuoso": "~4.18.10",
 		"storybook": "^9.1.13",
 		"typescript": "~5.9.3"
 	},
diff --git a/yarn.lock b/yarn.lock
index cb13b0a80761d..b44867cfac94f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9291,7 +9291,7 @@ __metadata:
     react: "npm:~19.2.7"
     react-dom: "npm:~19.2.7"
     react-i18next: "npm:~13.2.2"
-    react-virtuoso: "npm:~4.12.8"
+    react-virtuoso: "npm:~4.18.10"
     rimraf: "npm:^6.0.1"
     storybook: "npm:^9.1.13"
     typescript: "npm:~5.9.3"
@@ -9379,7 +9379,7 @@ __metadata:
     react-error-boundary: "npm:^3.1.4"
     react-i18next: "npm:~13.2.2"
     react-stately: "npm:~3.17.0"
-    react-virtuoso: "npm:~4.12.8"
+    react-virtuoso: "npm:~4.18.10"
     storybook: "npm:^9.1.13"
     typescript: "npm:~5.9.3"
     webpack: "npm:~5.104.1"
@@ -10081,7 +10081,7 @@ __metadata:
     react-is: "npm:~19.2.7"
     react-keyed-flatten-children: "npm:~5.1.2"
     react-stately: "npm:~3.17.0"
-    react-virtuoso: "npm:~4.12.8"
+    react-virtuoso: "npm:~4.18.10"
     reflect-metadata: "npm:^0.2.2"
     sanitize-html: "npm:~2.17.4"
     semver: "npm:^7.6.3"
@@ -10689,7 +10689,7 @@ __metadata:
     eslint: "npm:~9.39.4"
     react: "npm:~19.2.7"
     react-dom: "npm:~19.2.7"
-    react-virtuoso: "npm:~4.12.8"
+    react-virtuoso: "npm:~4.18.10"
     storybook: "npm:^9.1.13"
     storybook-dark-mode: "npm:^5.0.0"
     typescript: "npm:~5.9.3"
@@ -10780,7 +10780,7 @@ __metadata:
     eslint: "npm:~9.39.4"
     react: "npm:~19.2.7"
     react-dom: "npm:~19.2.7"
-    react-virtuoso: "npm:~4.12.8"
+    react-virtuoso: "npm:~4.18.10"
     typescript: "npm:~5.9.3"
   peerDependencies:
     "@rocket.chat/fuselage": "*"
@@ -10829,7 +10829,7 @@ __metadata:
     react-dom: "npm:~19.2.7"
     react-hook-form: "npm:~7.45.4"
     react-i18next: "npm:~13.2.2"
-    react-virtuoso: "npm:~4.12.8"
+    react-virtuoso: "npm:~4.18.10"
     storybook: "npm:^9.1.13"
     typescript: "npm:~5.9.3"
   peerDependencies:
@@ -10873,7 +10873,7 @@ __metadata:
     jest: "npm:~30.2.0"
     react: "npm:~19.2.7"
     react-dom: "npm:~19.2.7"
-    react-virtuoso: "npm:~4.12.8"
+    react-virtuoso: "npm:~4.18.10"
     storybook: "npm:^9.1.13"
     typescript: "npm:~5.9.3"
     webpack: "npm:~5.104.1"
@@ -10912,7 +10912,7 @@ __metadata:
     mongodb: "npm:6.16.0"
     react: "npm:~19.2.7"
     react-dom: "npm:~19.2.7"
-    react-virtuoso: "npm:~4.12.8"
+    react-virtuoso: "npm:~4.18.10"
     typescript: "npm:~5.9.3"
   peerDependencies:
     "@rocket.chat/core-typings": "workspace:^"
@@ -10973,7 +10973,7 @@ __metadata:
     jest-axe: "npm:~10.0.0"
     react: "npm:~19.2.7"
     react-dom: "npm:~19.2.7"
-    react-virtuoso: "npm:~4.12.8"
+    react-virtuoso: "npm:~4.18.10"
     storybook: "npm:^9.1.13"
     typescript: "npm:~5.9.3"
     webpack: "npm:~5.104.1"
@@ -11035,7 +11035,7 @@ __metadata:
     react: "npm:~19.2.7"
     react-dom: "npm:~19.2.7"
     react-i18next: "npm:~13.2.2"
-    react-virtuoso: "npm:~4.12.8"
+    react-virtuoso: "npm:~4.18.10"
     storybook: "npm:^9.1.13"
     typescript: "npm:~5.9.3"
   peerDependencies:
@@ -11090,7 +11090,7 @@ __metadata:
     react-dom: "npm:~19.2.7"
     react-router-dom: "npm:^6.30.4"
     react-split-pane: "npm:^0.1.92"
-    react-virtuoso: "npm:~4.12.8"
+    react-virtuoso: "npm:~4.18.10"
     reactflow: "npm:^11.11.4"
     typescript: "npm:~5.9.3"
     vite: "npm:^8.0.16"
@@ -11129,7 +11129,7 @@ __metadata:
     react-dom: "npm:~19.2.7"
     react-hook-form: "npm:~7.45.4"
     react-i18next: "npm:~13.2.2"
-    react-virtuoso: "npm:~4.12.8"
+    react-virtuoso: "npm:~4.18.10"
     storybook: "npm:^9.1.13"
     typescript: "npm:~5.9.3"
   peerDependencies:
@@ -32015,13 +32015,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-virtuoso@npm:~4.12.8":
-  version: 4.12.8
-  resolution: "react-virtuoso@npm:4.12.8"
+"react-virtuoso@npm:~4.18.10":
+  version: 4.18.10
+  resolution: "react-virtuoso@npm:4.18.10"
   peerDependencies:
     react: ">=16 || >=17 || >= 18 || >= 19"
     react-dom: ">=16 || >=17 || >= 18 || >=19"
-  checksum: 10/3d37ff207423d1860f99c5999f083b71b27254da45ce770fa392fa77e3d47fc670157bb372ccdff657353077a036264dc0cf3308ca5efb6f8cfc5792597ae441
+  checksum: 10/b4e9c074ef7e3e0c27f532e6d6bf1c590c1cc4b4df991fdae9ed5b8c21805a3f0baf6695a810eb0458f53de5a8869ce6ac93f602f67a65a9571f5b87b3588f75
   languageName: node
   linkType: hard
 

From b784b8066b613b6e4e77e44b9fcb18ecb1277728 Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso.evangelista@rocket.chat>
Date: Tue, 30 Jun 2026 02:27:03 -0300
Subject: [PATCH 7/8] refactor(deps): upgrade `react-hook-form`

---
 apps/meteor/package.json                  |  2 +-
 packages/livechat/package.json            |  2 +-
 packages/ui-client/package.json           |  2 +-
 packages/web-ui-registration/package.json |  2 +-
 yarn.lock                                 | 17 ++++-------------
 5 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index cbaa42e363d08..9e1dc29a54edc 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -277,7 +277,7 @@
 		"react-aria": "~3.37.0",
 		"react-dom": "~19.2.7",
 		"react-error-boundary": "^3.1.4",
-		"react-hook-form": "~7.45.4",
+		"react-hook-form": "~7.54.2",
 		"react-i18next": "~13.2.2",
 		"react-is": "~19.2.7",
 		"react-keyed-flatten-children": "~5.1.2",
diff --git a/packages/livechat/package.json b/packages/livechat/package.json
index 6080c3ba19127..1185a62c9d382 100644
--- a/packages/livechat/package.json
+++ b/packages/livechat/package.json
@@ -46,7 +46,7 @@
 		"preact": "~10.25.4",
 		"preact-router": "^4.1.2",
 		"query-string": "^7.1.3",
-		"react-hook-form": "~7.45.4",
+		"react-hook-form": "~7.54.2",
 		"react-i18next": "~13.2.2",
 		"whatwg-fetch": "^3.6.20"
 	},
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index 0c5c142f1f014..891a91ca4d162 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -54,7 +54,7 @@
 		"re-resizable": "^6.10.4",
 		"react": "~19.2.7",
 		"react-dom": "~19.2.7",
-		"react-hook-form": "~7.45.4",
+		"react-hook-form": "~7.54.2",
 		"react-i18next": "~13.2.2",
 		"react-virtuoso": "~4.18.10",
 		"storybook": "^9.1.13",
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index 6a303b2e04533..74a3e357cad02 100644
--- a/packages/web-ui-registration/package.json
+++ b/packages/web-ui-registration/package.json
@@ -45,7 +45,7 @@
 		"i18next": "~23.4.9",
 		"react": "~19.2.7",
 		"react-dom": "~19.2.7",
-		"react-hook-form": "~7.45.4",
+		"react-hook-form": "~7.54.2",
 		"react-i18next": "~13.2.2",
 		"react-virtuoso": "~4.18.10",
 		"storybook": "^9.1.13",
diff --git a/yarn.lock b/yarn.lock
index b44867cfac94f..526e11ed5b27e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9593,7 +9593,7 @@ __metadata:
     query-string: "npm:^7.1.3"
     react: "npm:~19.2.7"
     react-dom: "npm:~19.2.7"
-    react-hook-form: "npm:~7.45.4"
+    react-hook-form: "npm:~7.54.2"
     react-i18next: "npm:~13.2.2"
     resolve-url-loader: "npm:~5.0.0"
     rimraf: "npm:^6.0.1"
@@ -10076,7 +10076,7 @@ __metadata:
     react-docgen-typescript-plugin: "npm:^1.0.8"
     react-dom: "npm:~19.2.7"
     react-error-boundary: "npm:^3.1.4"
-    react-hook-form: "npm:~7.45.4"
+    react-hook-form: "npm:~7.54.2"
     react-i18next: "npm:~13.2.2"
     react-is: "npm:~19.2.7"
     react-keyed-flatten-children: "npm:~5.1.2"
@@ -10827,7 +10827,7 @@ __metadata:
     re-resizable: "npm:^6.10.4"
     react: "npm:~19.2.7"
     react-dom: "npm:~19.2.7"
-    react-hook-form: "npm:~7.45.4"
+    react-hook-form: "npm:~7.54.2"
     react-i18next: "npm:~13.2.2"
     react-virtuoso: "npm:~4.18.10"
     storybook: "npm:^9.1.13"
@@ -11127,7 +11127,7 @@ __metadata:
     i18next: "npm:~23.4.9"
     react: "npm:~19.2.7"
     react-dom: "npm:~19.2.7"
-    react-hook-form: "npm:~7.45.4"
+    react-hook-form: "npm:~7.54.2"
     react-i18next: "npm:~13.2.2"
     react-virtuoso: "npm:~4.18.10"
     storybook: "npm:^9.1.13"
@@ -31781,15 +31781,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-hook-form@npm:~7.45.4":
-  version: 7.45.4
-  resolution: "react-hook-form@npm:7.45.4"
-  peerDependencies:
-    react: ^16.8.0 || ^17 || ^18
-  checksum: 10/499d51c758161081fab0d22e7720e33e45d678fc2c8af2ff939434a61fab7043624c35afdfa27fa93fdc17d50a9683deb8b39bf308643f71b32126e561270641
-  languageName: node
-  linkType: hard
-
 "react-hook-form@npm:~7.54.2":
   version: 7.54.2
   resolution: "react-hook-form@npm:7.54.2"

From 88d49d2a3b8ad4a64446a0b90bf3bf499c48d9a6 Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso.evangelista@rocket.chat>
Date: Tue, 30 Jun 2026 03:05:00 -0300
Subject: [PATCH 8/8] refactor(deps): upgrade `react-error-boundary`

---
 .../EngagementDashboardCardErrorBoundary.tsx     |  4 ++--
 apps/meteor/client/views/root/AppErrorPage.tsx   |  9 +--------
 .../client/views/root/OutermostErrorBoundary.tsx |  6 +-----
 apps/meteor/package.json                         |  2 +-
 packages/gazzodown/package.json                  |  2 +-
 .../gazzodown/src/katex/KatexErrorBoundary.tsx   |  4 ++--
 yarn.lock                                        | 16 +++++++---------
 7 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardCardErrorBoundary.tsx b/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardCardErrorBoundary.tsx
index c88cc1ec9318c..4f93811315fa9 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardCardErrorBoundary.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardCardErrorBoundary.tsx
@@ -12,10 +12,10 @@ type EngagementDashboardCardErrorBoundaryProps = {
 const EngagementDashboardCardErrorBoundary = ({ children }: EngagementDashboardCardErrorBoundaryProps) => {
 	const { t } = useTranslation();
 
-	const [error, setError] = useState<Error>();
+	const [error, setError] = useState<unknown>(null);
 	const isError = (error: unknown): error is Error => error instanceof Error;
 
-	const errorHandler = (error: Error, info: { componentStack: string }): void => {
+	const errorHandler = (error: unknown, info: { componentStack?: string | null }): void => {
 		setError(error);
 		console.error('Uncaught Error:', error, info);
 	};
diff --git a/apps/meteor/client/views/root/AppErrorPage.tsx b/apps/meteor/client/views/root/AppErrorPage.tsx
index affd1dbb76a20..f489161db3c91 100644
--- a/apps/meteor/client/views/root/AppErrorPage.tsx
+++ b/apps/meteor/client/views/root/AppErrorPage.tsx
@@ -1,14 +1,7 @@
 import { Box, PaletteStyleTag, States, StatesAction, StatesActions, StatesIcon, StatesSubtitle, StatesTitle } from '@rocket.chat/fuselage';
 import { useThemeMode } from '@rocket.chat/ui-client';
-import type { ErrorInfo } from 'react';
 
-type AppErrorPageProps = {
-	error: Error;
-	info?: ErrorInfo;
-	clearError: () => void;
-};
-
-const AppErrorPage = (_props: AppErrorPageProps) => {
+const AppErrorPage = () => {
 	const [, , theme] = useThemeMode();
 
 	return (
diff --git a/apps/meteor/client/views/root/OutermostErrorBoundary.tsx b/apps/meteor/client/views/root/OutermostErrorBoundary.tsx
index f72a1b7bad7a7..9a18118abdb9a 100644
--- a/apps/meteor/client/views/root/OutermostErrorBoundary.tsx
+++ b/apps/meteor/client/views/root/OutermostErrorBoundary.tsx
@@ -44,11 +44,7 @@ const OutermostErrorBoundary = ({ children }: OutermostErrorBoundaryProps) => {
 		return <BugsnagErrorBoundary FallbackComponent={AppErrorPage}>{children}</BugsnagErrorBoundary>;
 	}
 
-	return (
-		<ErrorBoundary fallbackRender={({ error, resetErrorBoundary }) => <AppErrorPage error={error} clearError={resetErrorBoundary} />}>
-			{children}
-		</ErrorBoundary>
-	);
+	return <ErrorBoundary fallbackRender={() => <AppErrorPage />}>{children}</ErrorBoundary>;
 };
 
 export default OutermostErrorBoundary;
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index 9e1dc29a54edc..cc3ba76027d1d 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -276,7 +276,7 @@
 		"react": "~19.2.7",
 		"react-aria": "~3.37.0",
 		"react-dom": "~19.2.7",
-		"react-error-boundary": "^3.1.4",
+		"react-error-boundary": "~6.1.2",
 		"react-hook-form": "~7.54.2",
 		"react-i18next": "~13.2.2",
 		"react-is": "~19.2.7",
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index 767c1eebfb552..52e3756552612 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -24,7 +24,7 @@
 		"date-fns": "~4.1.0",
 		"dompurify": "~3.4.7",
 		"highlight.js": "11.8.0",
-		"react-error-boundary": "^3.1.4",
+		"react-error-boundary": "~6.1.2",
 		"react-stately": "~3.17.0"
 	},
 	"devDependencies": {
diff --git a/packages/gazzodown/src/katex/KatexErrorBoundary.tsx b/packages/gazzodown/src/katex/KatexErrorBoundary.tsx
index 073b2a7a44625..a94cb23eae79f 100644
--- a/packages/gazzodown/src/katex/KatexErrorBoundary.tsx
+++ b/packages/gazzodown/src/katex/KatexErrorBoundary.tsx
@@ -12,9 +12,9 @@ const Fallback = styled('span')`
 `;
 
 const KatexErrorBoundary = ({ children, code }: KatexErrorBoundaryProps) => {
-	const [error, setError] = useState<Error | null>(null);
+	const [error, setError] = useState<unknown>(null);
 	return (
-		<ErrorBoundary onError={setError} fallback={<Fallback title={error?.message}>{code}</Fallback>}>
+		<ErrorBoundary onError={setError} fallback={<Fallback title={(error as Error)?.message}>{code}</Fallback>}>
 			{children}
 		</ErrorBoundary>
 	);
diff --git a/yarn.lock b/yarn.lock
index 526e11ed5b27e..615bca13effa9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9376,7 +9376,7 @@ __metadata:
     react: "npm:~19.2.7"
     react-aria: "npm:~3.37.0"
     react-dom: "npm:~19.2.7"
-    react-error-boundary: "npm:^3.1.4"
+    react-error-boundary: "npm:~6.1.2"
     react-i18next: "npm:~13.2.2"
     react-stately: "npm:~3.17.0"
     react-virtuoso: "npm:~4.18.10"
@@ -10075,7 +10075,7 @@ __metadata:
     react-aria: "npm:~3.37.0"
     react-docgen-typescript-plugin: "npm:^1.0.8"
     react-dom: "npm:~19.2.7"
-    react-error-boundary: "npm:^3.1.4"
+    react-error-boundary: "npm:~6.1.2"
     react-hook-form: "npm:~7.54.2"
     react-i18next: "npm:~13.2.2"
     react-is: "npm:~19.2.7"
@@ -31770,14 +31770,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-error-boundary@npm:^3.1.4":
-  version: 3.1.4
-  resolution: "react-error-boundary@npm:3.1.4"
-  dependencies:
-    "@babel/runtime": "npm:^7.12.5"
+"react-error-boundary@npm:~6.1.2":
+  version: 6.1.2
+  resolution: "react-error-boundary@npm:6.1.2"
   peerDependencies:
-    react: ">=16.13.1"
-  checksum: 10/7418637bf352b88f35ff3798e6faa094ee046df9d422fc08f54c017892c3c0738dac661ba3d64d97209464e7a60e7fbbeffdbeaee5edc38f3aaf5f1f4a8bf610
+    react: ^18.0.0 || ^19.0.0
+  checksum: 10/b500bb59dfef0971552befe5f4613fa67ce84337c1228d1125a1a2ba7a0f41a6f69c436245b56d0821b286201268de2da9ab1765c4eb19b544d88cc9f1848ab1
   languageName: node
   linkType: hard