From 27adffcae2b16e20a39f436a1ae49c4984e6d49d Mon Sep 17 00:00:00 2001
From: Gustavo Reis Bauer <gustavoreisbauer@gmail.com>
Date: Wed, 23 Oct 2024 12:22:50 -0300
Subject: [PATCH 01/22] regression: not allowed to install marketplace apps
 (#33695)

---
 apps/meteor/app/api/server/v1/misc.ts         |  3 +-
 apps/meteor/app/apps/server/bridges/cloud.ts  |  2 +-
 .../functions/getWorkspaceAccessToken.ts      | 21 ++++++++++----
 .../getWorkspaceAccessTokenWithScope.ts       | 19 ++++++++++--
 .../server/functions/saveRegistrationData.ts  |  8 +----
 .../ee/server/apps/communication/rest.ts      |  4 +--
 .../server/models/raw/WorkspaceCredentials.ts | 29 +++----------------
 apps/meteor/server/startup/migrations/v316.ts | 15 ++--------
 .../src/ee/IWorkspaceCredentials.ts           |  2 +-
 .../src/models/IWorkspaceCredentialsModel.ts  |  1 -
 10 files changed, 45 insertions(+), 59 deletions(-)

diff --git a/apps/meteor/app/api/server/v1/misc.ts b/apps/meteor/app/api/server/v1/misc.ts
index 5cd522d20533..c026236231d8 100644
--- a/apps/meteor/app/api/server/v1/misc.ts
+++ b/apps/meteor/app/api/server/v1/misc.ts
@@ -664,7 +664,8 @@ API.v1.addRoute(
 			const settingsIds: string[] = [];
 
 			if (this.bodyParams.setDeploymentAs === 'new-workspace') {
-				await WorkspaceCredentials.unsetCredentialByScope();
+				await WorkspaceCredentials.removeAllCredentials();
+
 				settingsIds.push(
 					'Cloud_Service_Agree_PrivacyTerms',
 					'Cloud_Workspace_Id',
diff --git a/apps/meteor/app/apps/server/bridges/cloud.ts b/apps/meteor/app/apps/server/bridges/cloud.ts
index 30ca897240f8..0f908ccfe0a3 100644
--- a/apps/meteor/app/apps/server/bridges/cloud.ts
+++ b/apps/meteor/app/apps/server/bridges/cloud.ts
@@ -12,7 +12,7 @@ export class AppCloudBridge extends CloudWorkspaceBridge {
 	public async getWorkspaceToken(scope: string, appId: string): Promise<IWorkspaceToken> {
 		this.orch.debugLog(`App ${appId} is getting the workspace's token`);
 
-		const token = await getWorkspaceAccessTokenWithScope(scope);
+		const token = await getWorkspaceAccessTokenWithScope({ scope });
 
 		return token;
 	}
diff --git a/apps/meteor/app/cloud/server/functions/getWorkspaceAccessToken.ts b/apps/meteor/app/cloud/server/functions/getWorkspaceAccessToken.ts
index 93cfa3266ecf..6595c8e90fc4 100644
--- a/apps/meteor/app/cloud/server/functions/getWorkspaceAccessToken.ts
+++ b/apps/meteor/app/cloud/server/functions/getWorkspaceAccessToken.ts
@@ -1,6 +1,8 @@
 import type { IWorkspaceCredentials } from '@rocket.chat/core-typings';
 import { WorkspaceCredentials } from '@rocket.chat/models';
 
+import { SystemLogger } from '../../../../server/lib/logger/system';
+import { workspaceScopes } from '../oauthScopes';
 import { getWorkspaceAccessTokenWithScope } from './getWorkspaceAccessTokenWithScope';
 import { retrieveRegistrationStatus } from './retrieveRegistrationStatus';
 
@@ -24,20 +26,27 @@ export async function getWorkspaceAccessToken(forceNew = false, scope = '', save
 		return '';
 	}
 
-	const workspaceCredentials = await WorkspaceCredentials.getCredentialByScope(scope);
-	if (!workspaceCredentials) {
-		throw new CloudWorkspaceAccessTokenError();
+	// Note: If no scope is given, it means we should assume the default scope, we store the default scopes
+	//       in the global variable workspaceScopes.
+	if (scope === '') {
+		scope = workspaceScopes.join(' ');
 	}
 
-	if (!hasWorkspaceAccessTokenExpired(workspaceCredentials) && !forceNew) {
+	const workspaceCredentials = await WorkspaceCredentials.getCredentialByScope(scope);
+	if (workspaceCredentials && !hasWorkspaceAccessTokenExpired(workspaceCredentials) && !forceNew) {
+		SystemLogger.debug(
+			`Workspace credentials cache hit using scope: ${scope}. Avoiding generating a new access token from cloud services.`,
+		);
 		return workspaceCredentials.accessToken;
 	}
 
-	const accessToken = await getWorkspaceAccessTokenWithScope(scope, throwOnError);
+	SystemLogger.debug(`Workspace credentials cache miss using scope: ${scope}, fetching new access token from cloud services.`);
+
+	const accessToken = await getWorkspaceAccessTokenWithScope({ scope, throwOnError });
 
 	if (save) {
 		await WorkspaceCredentials.updateCredentialByScope({
-			scope,
+			scope: accessToken.scope,
 			accessToken: accessToken.token,
 			expirationDate: accessToken.expiresAt,
 		});
diff --git a/apps/meteor/app/cloud/server/functions/getWorkspaceAccessTokenWithScope.ts b/apps/meteor/app/cloud/server/functions/getWorkspaceAccessTokenWithScope.ts
index 3a04031ebb88..1137b899967a 100644
--- a/apps/meteor/app/cloud/server/functions/getWorkspaceAccessTokenWithScope.ts
+++ b/apps/meteor/app/cloud/server/functions/getWorkspaceAccessTokenWithScope.ts
@@ -8,10 +8,24 @@ import { CloudWorkspaceAccessTokenError } from './getWorkspaceAccessToken';
 import { removeWorkspaceRegistrationInfo } from './removeWorkspaceRegistrationInfo';
 import { retrieveRegistrationStatus } from './retrieveRegistrationStatus';
 
-export async function getWorkspaceAccessTokenWithScope(scope = '', throwOnError = false) {
+type WorkspaceAccessTokenWithScope = {
+	token: string;
+	expiresAt: Date;
+	scope: string;
+};
+
+type GetWorkspaceAccessTokenWithScopeParams = {
+	scope?: string;
+	throwOnError?: boolean;
+};
+
+export async function getWorkspaceAccessTokenWithScope({
+	scope = '',
+	throwOnError = false,
+}: GetWorkspaceAccessTokenWithScopeParams): Promise<WorkspaceAccessTokenWithScope> {
 	const { workspaceRegistered } = await retrieveRegistrationStatus();
 
-	const tokenResponse = { token: '', expiresAt: new Date() };
+	const tokenResponse = { token: '', expiresAt: new Date(), scope: '' };
 
 	if (!workspaceRegistered) {
 		return tokenResponse;
@@ -62,6 +76,7 @@ export async function getWorkspaceAccessTokenWithScope(scope = '', throwOnError
 		return {
 			token: payload.access_token,
 			expiresAt,
+			scope: payload.scope,
 		};
 	} catch (err: any) {
 		if (err instanceof CloudWorkspaceAccessTokenError) {
diff --git a/apps/meteor/app/cloud/server/functions/saveRegistrationData.ts b/apps/meteor/app/cloud/server/functions/saveRegistrationData.ts
index 746904687d67..63633c567845 100644
--- a/apps/meteor/app/cloud/server/functions/saveRegistrationData.ts
+++ b/apps/meteor/app/cloud/server/functions/saveRegistrationData.ts
@@ -1,5 +1,5 @@
 import { applyLicense } from '@rocket.chat/license';
-import { Settings, WorkspaceCredentials } from '@rocket.chat/models';
+import { Settings } from '@rocket.chat/models';
 
 import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener';
 import { settings } from '../../../settings/server';
@@ -59,12 +59,6 @@ async function saveRegistrationDataBase({
 		{ _id: 'Cloud_Workspace_Registration_Client_Uri', value: registration_client_uri },
 	];
 
-	await WorkspaceCredentials.updateCredentialByScope({
-		scope: '',
-		accessToken: '',
-		expirationDate: new Date(0),
-	});
-
 	const promises = [...settingsData.map(({ _id, value }) => Settings.updateValueById(_id, value))];
 
 	(await Promise.all(promises)).forEach((value, index) => {
diff --git a/apps/meteor/ee/server/apps/communication/rest.ts b/apps/meteor/ee/server/apps/communication/rest.ts
index fc597d00857c..0283f2eef783 100644
--- a/apps/meteor/ee/server/apps/communication/rest.ts
+++ b/apps/meteor/ee/server/apps/communication/rest.ts
@@ -189,7 +189,7 @@ export class AppsRestApi {
 						return API.v1.failure({ error: 'Invalid purchase type' });
 					}
 
-					const response = await getWorkspaceAccessTokenWithScope('marketplace:purchase');
+					const response = await getWorkspaceAccessTokenWithScope({ scope: 'marketplace:purchase' });
 					if (!response.token) {
 						return API.v1.failure({ error: 'Unauthorized' });
 					}
@@ -289,7 +289,7 @@ export class AppsRestApi {
 							return API.v1.failure({ error: 'Invalid purchase type' });
 						}
 
-						const token = await getWorkspaceAccessTokenWithScope('marketplace:purchase');
+						const token = await getWorkspaceAccessTokenWithScope({ scope: 'marketplace:purchase' });
 						if (!token) {
 							return API.v1.failure({ error: 'Unauthorized' });
 						}
diff --git a/apps/meteor/server/models/raw/WorkspaceCredentials.ts b/apps/meteor/server/models/raw/WorkspaceCredentials.ts
index b989ace8c2a3..09706cdec4bb 100644
--- a/apps/meteor/server/models/raw/WorkspaceCredentials.ts
+++ b/apps/meteor/server/models/raw/WorkspaceCredentials.ts
@@ -10,31 +10,15 @@ export class WorkspaceCredentialsRaw extends BaseRaw<IWorkspaceCredentials> impl
 	}
 
 	protected modelIndexes(): IndexDescription[] {
-		return [{ key: { scopes: 1, expirationDate: 1, accessToken: 1 }, unique: true }];
+		return [{ key: { scope: 1, expirationDate: 1, accessToken: 1 }, unique: true }];
 	}
 
 	getCredentialByScope(scope = ''): Promise<IWorkspaceCredentials | null> {
-		const query: Filter<IWorkspaceCredentials> = {
-			scopes: {
-				$all: [scope],
-				$size: 1,
-			},
-		};
+		const query: Filter<IWorkspaceCredentials> = { scope };
 
 		return this.findOne(query);
 	}
 
-	unsetCredentialByScope(scope = ''): Promise<DeleteResult> {
-		const query: Filter<IWorkspaceCredentials> = {
-			scopes: {
-				$all: [scope],
-				$size: 1,
-			},
-		};
-
-		return this.deleteOne(query);
-	}
-
 	updateCredentialByScope({
 		scope,
 		accessToken,
@@ -46,18 +30,13 @@ export class WorkspaceCredentialsRaw extends BaseRaw<IWorkspaceCredentials> impl
 	}): Promise<UpdateResult> {
 		const record = {
 			$set: {
-				scopes: [scope],
+				scope,
 				accessToken,
 				expirationDate,
 			},
 		};
 
-		const query: Filter<IWorkspaceCredentials> = {
-			scopes: {
-				$all: [scope],
-				$size: 1,
-			},
-		};
+		const query: Filter<IWorkspaceCredentials> = { scope };
 
 		return this.updateOne(query, record, { upsert: true });
 	}
diff --git a/apps/meteor/server/startup/migrations/v316.ts b/apps/meteor/server/startup/migrations/v316.ts
index c8641b896e77..210dafc4483f 100644
--- a/apps/meteor/server/startup/migrations/v316.ts
+++ b/apps/meteor/server/startup/migrations/v316.ts
@@ -1,16 +1,11 @@
-import { Settings, WorkspaceCredentials } from '@rocket.chat/models';
+import { Settings } from '@rocket.chat/models';
 
 import { addMigration } from '../../lib/migrations';
 
 addMigration({
 	version: 316,
-	name: 'Remove Cloud_Workspace_Access_Token and Cloud_Workspace_Access_Token_Expires_At from the settings collection and add to the WorkspaceCredentials collection',
+	name: 'Remove Cloud_Workspace_Access_Token and Cloud_Workspace_Access_Token_Expires_At from the settings collection',
 	async up() {
-		const workspaceCredentials = await WorkspaceCredentials.getCredentialByScope();
-		if (workspaceCredentials) {
-			return;
-		}
-
 		const accessToken = ((await Settings.getValueById('Cloud_Workspace_Access_Token')) as string) || '';
 		const expirationDate = ((await Settings.getValueById('Cloud_Workspace_Access_Token_Expires_At')) as Date) || new Date(0);
 
@@ -21,11 +16,5 @@ addMigration({
 		if (expirationDate) {
 			await Settings.removeById('Cloud_Workspace_Access_Token_Expires_At');
 		}
-
-		await WorkspaceCredentials.updateCredentialByScope({
-			scope: '',
-			accessToken,
-			expirationDate,
-		});
 	},
 });
diff --git a/packages/core-typings/src/ee/IWorkspaceCredentials.ts b/packages/core-typings/src/ee/IWorkspaceCredentials.ts
index 1acf4570f3cf..1fda00d0c8b3 100644
--- a/packages/core-typings/src/ee/IWorkspaceCredentials.ts
+++ b/packages/core-typings/src/ee/IWorkspaceCredentials.ts
@@ -2,7 +2,7 @@ import type { IRocketChatRecord } from '../IRocketChatRecord';
 
 export interface IWorkspaceCredentials extends IRocketChatRecord {
 	_id: string;
-	scopes: string[];
+	scope: string;
 	expirationDate: Date;
 	accessToken: string;
 }
diff --git a/packages/model-typings/src/models/IWorkspaceCredentialsModel.ts b/packages/model-typings/src/models/IWorkspaceCredentialsModel.ts
index 58b9a8a5049d..fa13dfa82977 100644
--- a/packages/model-typings/src/models/IWorkspaceCredentialsModel.ts
+++ b/packages/model-typings/src/models/IWorkspaceCredentialsModel.ts
@@ -5,7 +5,6 @@ import type { IBaseModel } from './IBaseModel';
 
 export interface IWorkspaceCredentialsModel extends IBaseModel<IWorkspaceCredentials> {
 	getCredentialByScope(scope?: string): Promise<IWorkspaceCredentials | null>;
-	unsetCredentialByScope(scope?: string): Promise<DeleteResult>;
 	updateCredentialByScope(credentials: { scope: string; accessToken: string; expirationDate: Date }): Promise<UpdateResult>;
 	removeAllCredentials(): Promise<DeleteResult>;
 }

From 696df97b2d25347a4825338a0932dedeaf861ecd Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Tue, 22 Oct 2024 13:22:51 -0300
Subject: [PATCH 02/22] regression: properly overwrite `Email.sendAsync`

---
 apps/meteor/packages/rocketchat-mongo-config/server/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/meteor/packages/rocketchat-mongo-config/server/index.js b/apps/meteor/packages/rocketchat-mongo-config/server/index.js
index 0cf40df6bbb4..63343ac64014 100644
--- a/apps/meteor/packages/rocketchat-mongo-config/server/index.js
+++ b/apps/meteor/packages/rocketchat-mongo-config/server/index.js
@@ -39,7 +39,7 @@ process.env.HTTP_FORWARDED_COUNT = process.env.HTTP_FORWARDED_COUNT || '1';
 
 // Just print to logs if in TEST_MODE due to a bug in Meteor 2.5: TypeError: Cannot read property '_syncSendMail' of null
 if (process.env.TEST_MODE === 'true') {
-	Email.sendAsync = function _sendAsync(options) {
+	Email.sendAsync = async function _sendAsync(options) {
 		console.log('Email.sendAsync', options);
 	};
 } else if (process.env.NODE_ENV !== 'development') {

From 86713bbfac40712a010e10c565b03912066c4c70 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Wed, 23 Oct 2024 15:19:25 -0300
Subject: [PATCH 03/22] regression: init db tracing within tracing package
 (#33712)

---
 _templates/service/new/service.ejs.t          |  5 ++++-
 apps/meteor/server/database/utils.ts          |  3 ---
 apps/meteor/server/tracing.ts                 |  4 +++-
 ee/apps/account-service/src/service.ts        |  6 +++---
 ee/apps/authorization-service/src/service.ts  |  6 +++---
 ee/apps/ddp-streamer/src/service.ts           |  6 +++---
 ee/apps/omnichannel-transcript/src/service.ts |  6 +++---
 ee/apps/presence-service/src/service.ts       |  6 +++---
 ee/apps/queue-worker/src/service.ts           |  6 +++---
 ee/apps/stream-hub-service/src/service.ts     |  6 +++---
 packages/core-services/src/lib/mongo.ts       | 15 +++++++--------
 packages/tracing/src/index.ts                 | 11 +++++++++--
 packages/tracing/src/traceDatabaseCalls.ts    | 11 ++---------
 13 files changed, 46 insertions(+), 45 deletions(-)

diff --git a/_templates/service/new/service.ejs.t b/_templates/service/new/service.ejs.t
index 699539365259..bdd160b43cdf 100644
--- a/_templates/service/new/service.ejs.t
+++ b/_templates/service/new/service.ejs.t
@@ -3,6 +3,7 @@ to: ee/apps/<%= name %>/src/service.ts
 ---
 import { api, getConnection, getTrashCollection } from '@rocket.chat/core-services';
 import { broker } from '@rocket.chat/network-broker';
+import { startTracing } from '@rocket.chat/tracing';
 import polka from 'polka';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
@@ -10,7 +11,9 @@ import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/reg
 const PORT = process.env.PORT || <%= h.random() %>;
 
 (async () => {
-	const db = await getConnection();
+	const { db } = await getConnection();
+
+	startTracing({ service: '<%= name %>', db: client });
 
 	registerServiceModels(db, await getTrashCollection());
 
diff --git a/apps/meteor/server/database/utils.ts b/apps/meteor/server/database/utils.ts
index e07df1e9e737..ec3864586924 100644
--- a/apps/meteor/server/database/utils.ts
+++ b/apps/meteor/server/database/utils.ts
@@ -1,6 +1,3 @@
-import { initDatabaseTracing } from '@rocket.chat/tracing';
 import { MongoInternals } from 'meteor/mongo';
 
 export const { db, client } = MongoInternals.defaultRemoteCollectionDriver().mongo;
-
-initDatabaseTracing(client);
diff --git a/apps/meteor/server/tracing.ts b/apps/meteor/server/tracing.ts
index e08bfebb20ac..8496ce1c49e3 100644
--- a/apps/meteor/server/tracing.ts
+++ b/apps/meteor/server/tracing.ts
@@ -1,3 +1,5 @@
 import { startTracing } from '@rocket.chat/tracing';
 
-startTracing({ service: 'core' });
+import { client } from './database/utils';
+
+startTracing({ service: 'core', db: client });
diff --git a/ee/apps/account-service/src/service.ts b/ee/apps/account-service/src/service.ts
index b5279998a52b..e9e8cd8bef83 100755
--- a/ee/apps/account-service/src/service.ts
+++ b/ee/apps/account-service/src/service.ts
@@ -5,12 +5,12 @@ import polka from 'polka';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
 
-startTracing({ service: 'account-service' });
-
 const PORT = process.env.PORT || 3033;
 
 (async () => {
-	const db = await getConnection();
+	const { db, client } = await getConnection();
+
+	startTracing({ service: 'account-service', db: client });
 
 	registerServiceModels(db, await getTrashCollection());
 
diff --git a/ee/apps/authorization-service/src/service.ts b/ee/apps/authorization-service/src/service.ts
index 699de7aeb518..8b3350c5f754 100755
--- a/ee/apps/authorization-service/src/service.ts
+++ b/ee/apps/authorization-service/src/service.ts
@@ -7,10 +7,10 @@ import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/reg
 
 const PORT = process.env.PORT || 3034;
 
-startTracing({ service: 'authorization-service' });
-
 (async () => {
-	const db = await getConnection();
+	const { db, client } = await getConnection();
+
+	startTracing({ service: 'authorization-service', db: client });
 
 	registerServiceModels(db, await getTrashCollection());
 
diff --git a/ee/apps/ddp-streamer/src/service.ts b/ee/apps/ddp-streamer/src/service.ts
index 4b43e1baed96..66ad72be4050 100755
--- a/ee/apps/ddp-streamer/src/service.ts
+++ b/ee/apps/ddp-streamer/src/service.ts
@@ -4,10 +4,10 @@ import { startTracing } from '@rocket.chat/tracing';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
 
-startTracing({ service: 'ddp-streamer' });
-
 (async () => {
-	const db = await getConnection();
+	const { db, client } = await getConnection();
+
+	startTracing({ service: 'ddp-streamer', db: client });
 
 	registerServiceModels(db, await getTrashCollection());
 
diff --git a/ee/apps/omnichannel-transcript/src/service.ts b/ee/apps/omnichannel-transcript/src/service.ts
index e313c0069e8d..e78d646bf9ea 100644
--- a/ee/apps/omnichannel-transcript/src/service.ts
+++ b/ee/apps/omnichannel-transcript/src/service.ts
@@ -6,12 +6,12 @@ import polka from 'polka';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
 
-startTracing({ service: 'omnichannel-transcript' });
-
 const PORT = process.env.PORT || 3036;
 
 (async () => {
-	const db = await getConnection();
+	const { db, client } = await getConnection();
+
+	startTracing({ service: 'omnichannel-transcript', db: client });
 
 	registerServiceModels(db, await getTrashCollection());
 
diff --git a/ee/apps/presence-service/src/service.ts b/ee/apps/presence-service/src/service.ts
index 5114c712dae7..f1e86419fc69 100755
--- a/ee/apps/presence-service/src/service.ts
+++ b/ee/apps/presence-service/src/service.ts
@@ -5,12 +5,12 @@ import polka from 'polka';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
 
-startTracing({ service: 'presence-service' });
-
 const PORT = process.env.PORT || 3031;
 
 (async () => {
-	const db = await getConnection();
+	const { db, client } = await getConnection();
+
+	startTracing({ service: 'presence-service', db: client });
 
 	registerServiceModels(db, await getTrashCollection());
 
diff --git a/ee/apps/queue-worker/src/service.ts b/ee/apps/queue-worker/src/service.ts
index a66d1a579bad..e936621e3389 100644
--- a/ee/apps/queue-worker/src/service.ts
+++ b/ee/apps/queue-worker/src/service.ts
@@ -6,12 +6,12 @@ import polka from 'polka';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
 
-startTracing({ service: 'queue-worker' });
-
 const PORT = process.env.PORT || 3038;
 
 (async () => {
-	const db = await getConnection();
+	const { db, client } = await getConnection();
+
+	startTracing({ service: 'queue-worker', db: client });
 
 	registerServiceModels(db, await getTrashCollection());
 
diff --git a/ee/apps/stream-hub-service/src/service.ts b/ee/apps/stream-hub-service/src/service.ts
index 26cea9676a02..84567026733c 100755
--- a/ee/apps/stream-hub-service/src/service.ts
+++ b/ee/apps/stream-hub-service/src/service.ts
@@ -8,12 +8,12 @@ import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/reg
 import { DatabaseWatcher } from '../../../../apps/meteor/server/database/DatabaseWatcher';
 import { StreamHub } from './StreamHub';
 
-startTracing({ service: 'stream-hub-service' });
-
 const PORT = process.env.PORT || 3035;
 
 (async () => {
-	const db = await getConnection();
+	const { db, client } = await getConnection();
+
+	startTracing({ service: 'stream-hub-service', db: client });
 
 	registerServiceModels(db, await getTrashCollection());
 
diff --git a/packages/core-services/src/lib/mongo.ts b/packages/core-services/src/lib/mongo.ts
index b41d838cd4a7..d61eab602145 100644
--- a/packages/core-services/src/lib/mongo.ts
+++ b/packages/core-services/src/lib/mongo.ts
@@ -1,4 +1,4 @@
-import { initDatabaseTracing, isTracingEnabled } from '@rocket.chat/tracing';
+import { isTracingEnabled } from '@rocket.chat/tracing';
 import { MongoClient } from 'mongodb';
 import type { Db, Collection, MongoClientOptions, Document } from 'mongodb';
 
@@ -21,28 +21,27 @@ function connectDb(options?: MongoClientOptions): Promise<MongoClient> {
 
 let db: Db;
 
-export const getConnection = ((): ((options?: MongoClientOptions) => Promise<Db>) => {
+export const getConnection = ((): ((options?: MongoClientOptions) => Promise<{ db: Db; client: MongoClient }>) => {
 	let client: MongoClient;
 
-	return async (options): Promise<Db> => {
+	return async (options): Promise<{ db: Db; client: MongoClient }> => {
 		if (db) {
-			return db;
+			return { db, client };
 		}
 		if (client == null) {
 			client = await connectDb(options);
 			db = client.db(name);
 		}
 
-		initDatabaseTracing(client);
-
 		// if getConnection was called multiple times before it was connected, wait for the connection
-		return client.db(name);
+		return { client, db: client.db(name) };
 	};
 })();
 
 export async function getTrashCollection<T extends Document>(): Promise<Collection<T>> {
 	if (!db) {
-		db = await getConnection();
+		const { db: clientDb } = await getConnection();
+		db = clientDb;
 	}
 	return db.collection<T>('rocketchat__trash');
 }
diff --git a/packages/tracing/src/index.ts b/packages/tracing/src/index.ts
index 8e97dabc63c5..95e726fd4420 100644
--- a/packages/tracing/src/index.ts
+++ b/packages/tracing/src/index.ts
@@ -2,8 +2,9 @@ import { context, propagation, SpanStatusCode, trace } from '@opentelemetry/api'
 import type { Span, SpanOptions, Tracer } from '@opentelemetry/api';
 import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-grpc';
 import { NodeSDK } from '@opentelemetry/sdk-node';
+import type { MongoClient } from 'mongodb';
 
-export { initDatabaseTracing } from './traceDatabaseCalls';
+import { initDatabaseTracing } from './traceDatabaseCalls';
 
 let tracer: Tracer | undefined;
 
@@ -11,7 +12,11 @@ export function isTracingEnabled() {
 	return ['yes', 'true'].includes(String(process.env.TRACING_ENABLED).toLowerCase());
 }
 
-export const startTracing = ({ service }: { service: string }) => {
+export const startTracing = ({ service, db }: { service: string; db: MongoClient }) => {
+	if (!isTracingEnabled()) {
+		return;
+	}
+
 	const exporter = new OTLPTraceExporter();
 
 	const sdk = new NodeSDK({
@@ -22,6 +27,8 @@ export const startTracing = ({ service }: { service: string }) => {
 	sdk.start();
 
 	tracer = trace.getTracer(service);
+
+	initDatabaseTracing(tracer, db);
 };
 
 export function tracerSpan<F extends (span?: Span) => ReturnType<F>>(
diff --git a/packages/tracing/src/traceDatabaseCalls.ts b/packages/tracing/src/traceDatabaseCalls.ts
index 6ddde0b39753..8f5f2ba4a7bd 100644
--- a/packages/tracing/src/traceDatabaseCalls.ts
+++ b/packages/tracing/src/traceDatabaseCalls.ts
@@ -1,15 +1,8 @@
+import type { Tracer } from '@opentelemetry/api';
 import { trace, context, SpanStatusCode } from '@opentelemetry/api';
 import type { MongoClient } from 'mongodb';
 
-import { isTracingEnabled } from '.';
-
-const tracer = trace.getTracer('core');
-
-export const initDatabaseTracing = (client: MongoClient) => {
-	if (!isTracingEnabled()) {
-		return;
-	}
-
+export const initDatabaseTracing = (tracer: Tracer, client: MongoClient) => {
 	const DurationStart = new Map();
 
 	client.on('commandStarted', (event) => {

From c683a417cd0b7e8e07b9d4f410d9915df2d5af61 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Wed, 23 Oct 2024 16:00:26 -0300
Subject: [PATCH 04/22] regression: properly overwrite
 `OAuth._retrievePendingCredential`

---
 apps/meteor/app/2fa/server/loginHandler.ts         | 4 ++--
 apps/meteor/definition/externals/meteor/oauth.d.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/meteor/app/2fa/server/loginHandler.ts b/apps/meteor/app/2fa/server/loginHandler.ts
index 26c9869a132f..1555a7904ae2 100644
--- a/apps/meteor/app/2fa/server/loginHandler.ts
+++ b/apps/meteor/app/2fa/server/loginHandler.ts
@@ -71,11 +71,11 @@ const recreateError = (errorDoc: Error | Meteor.Error): Error | Meteor.Error =>
 	return copyTo(errorDoc, error);
 };
 
-OAuth._retrievePendingCredential = function (key, ...args): string | Error | void {
+OAuth._retrievePendingCredential = async function (key, ...args): Promise<string | Error | void> {
 	const credentialSecret = args.length > 0 && args[0] !== undefined ? args[0] : undefined;
 	check(key, String);
 
-	const pendingCredential = OAuth._pendingCredentials.findOne({
+	const pendingCredential = await OAuth._pendingCredentials.findOneAsync({
 		key,
 		credentialSecret,
 	});
diff --git a/apps/meteor/definition/externals/meteor/oauth.d.ts b/apps/meteor/definition/externals/meteor/oauth.d.ts
index f07ede0b0b54..ff14ee1b8541 100644
--- a/apps/meteor/definition/externals/meteor/oauth.d.ts
+++ b/apps/meteor/definition/externals/meteor/oauth.d.ts
@@ -13,7 +13,7 @@ declare module 'meteor/oauth' {
 	}
 
 	namespace OAuth {
-		function _retrievePendingCredential(key: string, ...args: string[]): void;
+		function _retrievePendingCredential(key: string, ...args: string[]): Promise<string | Error | void>;
 		function openSecret(secret: string): string;
 		function retrieveCredential(credentialToken: string, credentialSecret: string);
 		function _retrieveCredentialSecret(credentialToken: string): string | null;

From 0649a67e1e9d5d017b962a043bba93dc8209e76e Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Wed, 23 Oct 2024 16:05:19 -0300
Subject: [PATCH 05/22] chore: npm install as rocketchat user (#33726)

Co-authored-by: Diego Sampaio <chinello@gmail.com>
---
 apps/meteor/.docker/Dockerfile.debian | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/apps/meteor/.docker/Dockerfile.debian b/apps/meteor/.docker/Dockerfile.debian
index c8ede9db3cae..7bbca15a9142 100644
--- a/apps/meteor/.docker/Dockerfile.debian
+++ b/apps/meteor/.docker/Dockerfile.debian
@@ -30,21 +30,27 @@ ENV DEPLOY_METHOD=docker \
 
 RUN aptMark="$(apt-mark showmanual)" \
     && apt-get install -y --no-install-recommends g++ make python3 ca-certificates \
-    && cd /app/bundle/programs/server \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $aptMark > /dev/null
+
+USER rocketchat
+
+RUN cd /app/bundle/programs/server \
     && npm install \
     && cd npm/node_modules/isolated-vm \
     && npm install \
-    && apt-mark auto '.*' > /dev/null \
-    && apt-mark manual $aptMark > /dev/null \
-    && find /usr/local -type f -executable -exec ldd '{}' ';' \
+    && npm cache clear --force
+
+USER root
+
+RUN find /usr/local -type f -executable -exec ldd '{}' ';' \
     | awk '/=>/ { print $(NF-1) }' \
     | sort -u \
     | xargs -r dpkg-query --search \
     | cut -d: -f1 \
     | sort -u \
     | xargs -r apt-mark manual \
-    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
-    && npm cache clear --force
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false
 
 USER rocketchat
 

From 09bb4ca90337a5053fb70eee23a949b532958fdf Mon Sep 17 00:00:00 2001
From: rocketchat-github-ci <buildmaster@rocket.chat>
Date: Wed, 23 Oct 2024 20:58:56 +0000
Subject: [PATCH 06/22] Release 7.0.0-rc.3

[no ci]
---
 .changeset/bump-patch-1729717124346.md        |  5 +++
 .changeset/pre.json                           |  1 +
 apps/meteor/CHANGELOG.md                      | 35 +++++++++++++++++++
 apps/meteor/app/utils/rocketchat.info         |  2 +-
 apps/meteor/ee/server/services/CHANGELOG.md   | 14 ++++++++
 apps/meteor/ee/server/services/package.json   |  2 +-
 apps/meteor/package.json                      |  2 +-
 apps/uikit-playground/CHANGELOG.md            | 12 +++++++
 apps/uikit-playground/package.json            |  2 +-
 ee/apps/account-service/CHANGELOG.md          | 14 ++++++++
 ee/apps/account-service/package.json          |  2 +-
 ee/apps/authorization-service/CHANGELOG.md    | 14 ++++++++
 ee/apps/authorization-service/package.json    |  2 +-
 ee/apps/ddp-streamer/CHANGELOG.md             | 15 ++++++++
 ee/apps/ddp-streamer/package.json             |  2 +-
 ee/apps/omnichannel-transcript/CHANGELOG.md   | 15 ++++++++
 ee/apps/omnichannel-transcript/package.json   |  2 +-
 ee/apps/presence-service/CHANGELOG.md         | 14 ++++++++
 ee/apps/presence-service/package.json         |  2 +-
 ee/apps/queue-worker/CHANGELOG.md             | 14 ++++++++
 ee/apps/queue-worker/package.json             |  2 +-
 ee/apps/stream-hub-service/CHANGELOG.md       | 13 +++++++
 ee/apps/stream-hub-service/package.json       |  2 +-
 ee/packages/license/CHANGELOG.md              |  9 +++++
 ee/packages/license/package.json              |  2 +-
 ee/packages/network-broker/CHANGELOG.md       |  9 +++++
 ee/packages/network-broker/package.json       |  2 +-
 ee/packages/omnichannel-services/CHANGELOG.md | 14 ++++++++
 ee/packages/omnichannel-services/package.json |  2 +-
 ee/packages/pdf-worker/CHANGELOG.md           |  9 +++++
 ee/packages/pdf-worker/package.json           |  2 +-
 ee/packages/presence/CHANGELOG.md             | 11 ++++++
 ee/packages/presence/package.json             |  2 +-
 package.json                                  |  2 +-
 packages/api-client/CHANGELOG.md              | 10 ++++++
 packages/api-client/package.json              |  2 +-
 packages/apps/CHANGELOG.md                    | 10 ++++++
 packages/apps/package.json                    |  2 +-
 packages/core-services/CHANGELOG.md           | 11 ++++++
 packages/core-services/package.json           |  2 +-
 packages/core-typings/CHANGELOG.md            |  2 ++
 packages/core-typings/package.json            |  2 +-
 packages/cron/CHANGELOG.md                    | 10 ++++++
 packages/cron/package.json                    |  2 +-
 packages/ddp-client/CHANGELOG.md              | 11 ++++++
 packages/ddp-client/package.json              |  2 +-
 packages/freeswitch/CHANGELOG.md              |  9 +++++
 packages/freeswitch/package.json              |  2 +-
 packages/fuselage-ui-kit/CHANGELOG.md         | 13 +++++++
 packages/fuselage-ui-kit/package.json         |  8 ++---
 packages/gazzodown/CHANGELOG.md               | 11 ++++++
 packages/gazzodown/package.json               |  6 ++--
 packages/instance-status/CHANGELOG.md         |  9 +++++
 packages/instance-status/package.json         |  2 +-
 packages/livechat/CHANGELOG.md                |  9 +++++
 packages/livechat/package.json                |  2 +-
 packages/model-typings/CHANGELOG.md           |  9 +++++
 packages/model-typings/package.json           |  2 +-
 packages/models/CHANGELOG.md                  |  9 +++++
 packages/models/package.json                  |  2 +-
 packages/rest-typings/CHANGELOG.md            |  9 +++++
 packages/rest-typings/package.json            |  2 +-
 packages/ui-avatar/CHANGELOG.md               |  9 +++++
 packages/ui-avatar/package.json               |  4 +--
 packages/ui-client/CHANGELOG.md               | 10 ++++++
 packages/ui-client/package.json               |  6 ++--
 packages/ui-contexts/CHANGELOG.md             | 11 ++++++
 packages/ui-contexts/package.json             |  2 +-
 packages/ui-video-conf/CHANGELOG.md           | 10 ++++++
 packages/ui-video-conf/package.json           |  6 ++--
 packages/ui-voip/CHANGELOG.md                 | 11 ++++++
 packages/ui-voip/package.json                 |  8 ++---
 packages/web-ui-registration/CHANGELOG.md     |  9 +++++
 packages/web-ui-registration/package.json     |  4 +--
 yarn.lock                                     | 28 +++++++--------
 75 files changed, 475 insertions(+), 65 deletions(-)
 create mode 100644 .changeset/bump-patch-1729717124346.md

diff --git a/.changeset/bump-patch-1729717124346.md b/.changeset/bump-patch-1729717124346.md
new file mode 100644
index 000000000000..e1eaa7980afb
--- /dev/null
+++ b/.changeset/bump-patch-1729717124346.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Bump @rocket.chat/meteor version.
diff --git a/.changeset/pre.json b/.changeset/pre.json
index 0d6531af024a..f28b23fe5d37 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -71,6 +71,7 @@
     "brown-pants-press",
     "bump-patch-1729526930133",
     "bump-patch-1729648473274",
+    "bump-patch-1729717124346",
     "chilled-boats-sip",
     "chilled-files-relate",
     "chilly-flowers-brake",
diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md
index 55bba48a1b49..bae262dff62f 100644
--- a/apps/meteor/CHANGELOG.md
+++ b/apps/meteor/CHANGELOG.md
@@ -1,5 +1,40 @@
 # @rocket.chat/meteor
 
+## 7.0.0-rc.3
+
+### Patch Changes
+
+- Bump @rocket.chat/meteor version.
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.3
+  - @rocket.chat/rest-typings@7.0.0-rc.3
+  - @rocket.chat/license@1.0.0-rc.3
+  - @rocket.chat/omnichannel-services@0.3.6-rc.3
+  - @rocket.chat/pdf-worker@0.2.6-rc.3
+  - @rocket.chat/presence@0.2.9-rc.3
+  - @rocket.chat/api-client@0.2.9-rc.3
+  - @rocket.chat/apps@0.2.0-rc.3
+  - @rocket.chat/core-services@0.7.1-rc.3
+  - @rocket.chat/cron@0.1.9-rc.3
+  - @rocket.chat/freeswitch@1.0.0-rc.3
+  - @rocket.chat/fuselage-ui-kit@12.0.0-rc.3
+  - @rocket.chat/gazzodown@12.0.0-rc.3
+  - @rocket.chat/model-typings@1.0.0-rc.3
+  - @rocket.chat/ui-contexts@12.0.0-rc.3
+  - @rocket.chat/server-cloud-communication@0.0.2
+  - @rocket.chat/network-broker@0.1.1-rc.3
+  - @rocket.chat/models@1.0.0-rc.3
+  - @rocket.chat/ui-theming@0.4.0-rc.0
+  - @rocket.chat/ui-avatar@8.0.0-rc.3
+  - @rocket.chat/ui-client@12.0.0-rc.3
+  - @rocket.chat/ui-video-conf@12.0.0-rc.3
+  - @rocket.chat/ui-voip@2.0.0-rc.3
+  - @rocket.chat/web-ui-registration@12.0.0-rc.3
+  - @rocket.chat/instance-status@0.1.9-rc.3
+  </details>
+
 ## 7.0.0-rc.2
 
 ### Patch Changes
diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info
index f8048816181e..1411afa507bf 100644
--- a/apps/meteor/app/utils/rocketchat.info
+++ b/apps/meteor/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "7.0.0-rc.2"
+	"version": "7.0.0-rc.3"
 }
diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md
index f7a48e9a27cc..1f90a13a1af1 100644
--- a/apps/meteor/ee/server/services/CHANGELOG.md
+++ b/apps/meteor/ee/server/services/CHANGELOG.md
@@ -1,5 +1,19 @@
 # rocketchat-services
 
+## 2.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.3
+  - @rocket.chat/rest-typings@7.0.0-rc.3
+  - @rocket.chat/core-services@0.7.1-rc.3
+  - @rocket.chat/model-typings@1.0.0-rc.3
+  - @rocket.chat/network-broker@0.1.1-rc.3
+  - @rocket.chat/models@1.0.0-rc.3
+  </details>
+
 ## 2.0.0-rc.2
 
 ### Patch Changes
diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index 6d635241a4f9..39ec14932fe8 100644
--- a/apps/meteor/ee/server/services/package.json
+++ b/apps/meteor/ee/server/services/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "rocketchat-services",
 	"private": true,
-	"version": "2.0.0-rc.2",
+	"version": "2.0.0-rc.3",
 	"description": "Rocket.Chat Authorization service",
 	"main": "index.js",
 	"scripts": {
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index b7ca00afaa94..e7e64332e63c 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/meteor",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "7.0.0-rc.2",
+	"version": "7.0.0-rc.3",
 	"private": true,
 	"author": {
 		"name": "Rocket.Chat",
diff --git a/apps/uikit-playground/CHANGELOG.md b/apps/uikit-playground/CHANGELOG.md
index 6e2bf8c8e980..225633b3ed1e 100644
--- a/apps/uikit-playground/CHANGELOG.md
+++ b/apps/uikit-playground/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @rocket.chat/uikit-playground
 
+## 0.6.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.3
+  - @rocket.chat/fuselage-ui-kit@12.0.0-rc.3
+  - @rocket.chat/ui-contexts@12.0.0-rc.3
+  - @rocket.chat/ui-avatar@8.0.0-rc.3
+  </details>
+
 ## 0.6.0-rc.2
 
 ### Patch Changes
diff --git a/apps/uikit-playground/package.json b/apps/uikit-playground/package.json
index a2bfd9d7de60..aa81d232aba6 100644
--- a/apps/uikit-playground/package.json
+++ b/apps/uikit-playground/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rocket.chat/uikit-playground",
   "private": true,
-  "version": "0.6.0-rc.2",
+  "version": "0.6.0-rc.3",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md
index b8b970166a83..6688e03f81c2 100644
--- a/ee/apps/account-service/CHANGELOG.md
+++ b/ee/apps/account-service/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/account-service
 
+## 0.4.9-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.3
+  - @rocket.chat/rest-typings@7.0.0-rc.3
+  - @rocket.chat/core-services@0.7.1-rc.3
+  - @rocket.chat/model-typings@1.0.0-rc.3
+  - @rocket.chat/network-broker@0.1.1-rc.3
+  - @rocket.chat/models@1.0.0-rc.3
+  </details>
+
 ## 0.4.9-rc.2
 
 ### Patch Changes
diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json
index 601a7236d3ad..d16650ab8d58 100644
--- a/ee/apps/account-service/package.json
+++ b/ee/apps/account-service/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/account-service",
 	"private": true,
-	"version": "0.4.9-rc.2",
+	"version": "0.4.9-rc.3",
 	"description": "Rocket.Chat Account service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",
diff --git a/ee/apps/authorization-service/CHANGELOG.md b/ee/apps/authorization-service/CHANGELOG.md
index b9305ec47bba..0ad246d9dc90 100644
--- a/ee/apps/authorization-service/CHANGELOG.md
+++ b/ee/apps/authorization-service/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/authorization-service
 
+## 0.4.9-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.3
+  - @rocket.chat/rest-typings@7.0.0-rc.3
+  - @rocket.chat/core-services@0.7.1-rc.3
+  - @rocket.chat/model-typings@1.0.0-rc.3
+  - @rocket.chat/network-broker@0.1.1-rc.3
+  - @rocket.chat/models@1.0.0-rc.3
+  </details>
+
 ## 0.4.9-rc.2
 
 ### Patch Changes
diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json
index 33bfdcbeff5b..597d3e409bb2 100644
--- a/ee/apps/authorization-service/package.json
+++ b/ee/apps/authorization-service/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/authorization-service",
 	"private": true,
-	"version": "0.4.9-rc.2",
+	"version": "0.4.9-rc.3",
 	"description": "Rocket.Chat Authorization service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",
diff --git a/ee/apps/ddp-streamer/CHANGELOG.md b/ee/apps/ddp-streamer/CHANGELOG.md
index 129d086b7bc9..1fd57b5ad9cd 100644
--- a/ee/apps/ddp-streamer/CHANGELOG.md
+++ b/ee/apps/ddp-streamer/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @rocket.chat/ddp-streamer
 
+## 0.3.9-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.3
+  - @rocket.chat/rest-typings@7.0.0-rc.3
+  - @rocket.chat/core-services@0.7.1-rc.3
+  - @rocket.chat/model-typings@1.0.0-rc.3
+  - @rocket.chat/network-broker@0.1.1-rc.3
+  - @rocket.chat/models@1.0.0-rc.3
+  - @rocket.chat/instance-status@0.1.9-rc.3
+  </details>
+
 ## 0.3.9-rc.2
 
 ### Patch Changes
diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
index b5e7e8c3c3d5..5d258120daa4 100644
--- a/ee/apps/ddp-streamer/package.json
+++ b/ee/apps/ddp-streamer/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/ddp-streamer",
 	"private": true,
-	"version": "0.3.9-rc.2",
+	"version": "0.3.9-rc.3",
 	"description": "Rocket.Chat DDP-Streamer service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",
diff --git a/ee/apps/omnichannel-transcript/CHANGELOG.md b/ee/apps/omnichannel-transcript/CHANGELOG.md
index 9cdbcfaf9369..3104ae81e3d2 100644
--- a/ee/apps/omnichannel-transcript/CHANGELOG.md
+++ b/ee/apps/omnichannel-transcript/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @rocket.chat/omnichannel-transcript
 
+## 0.4.9-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.3
+  - @rocket.chat/omnichannel-services@0.3.6-rc.3
+  - @rocket.chat/pdf-worker@0.2.6-rc.3
+  - @rocket.chat/core-services@0.7.1-rc.3
+  - @rocket.chat/model-typings@1.0.0-rc.3
+  - @rocket.chat/network-broker@0.1.1-rc.3
+  - @rocket.chat/models@1.0.0-rc.3
+  </details>
+
 ## 0.4.9-rc.2
 
 ### Patch Changes
diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json
index cd9c762a34f0..80e4b4e4df4f 100644
--- a/ee/apps/omnichannel-transcript/package.json
+++ b/ee/apps/omnichannel-transcript/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/omnichannel-transcript",
 	"private": true,
-	"version": "0.4.9-rc.2",
+	"version": "0.4.9-rc.3",
 	"description": "Rocket.Chat service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",
diff --git a/ee/apps/presence-service/CHANGELOG.md b/ee/apps/presence-service/CHANGELOG.md
index 8678a5215b8f..297aa361b91b 100644
--- a/ee/apps/presence-service/CHANGELOG.md
+++ b/ee/apps/presence-service/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/presence-service
 
+## 0.4.9-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.3
+  - @rocket.chat/presence@0.2.9-rc.3
+  - @rocket.chat/core-services@0.7.1-rc.3
+  - @rocket.chat/model-typings@1.0.0-rc.3
+  - @rocket.chat/network-broker@0.1.1-rc.3
+  - @rocket.chat/models@1.0.0-rc.3
+  </details>
+
 ## 0.4.9-rc.2
 
 ### Patch Changes
diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json
index 208a74795886..f9ca853ca550 100644
--- a/ee/apps/presence-service/package.json
+++ b/ee/apps/presence-service/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/presence-service",
 	"private": true,
-	"version": "0.4.9-rc.2",
+	"version": "0.4.9-rc.3",
 	"description": "Rocket.Chat Presence service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",
diff --git a/ee/apps/queue-worker/CHANGELOG.md b/ee/apps/queue-worker/CHANGELOG.md
index bba8d6c8e5a1..39c2d5a39b3d 100644
--- a/ee/apps/queue-worker/CHANGELOG.md
+++ b/ee/apps/queue-worker/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/queue-worker
 
+## 0.4.9-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.3
+  - @rocket.chat/omnichannel-services@0.3.6-rc.3
+  - @rocket.chat/core-services@0.7.1-rc.3
+  - @rocket.chat/model-typings@1.0.0-rc.3
+  - @rocket.chat/network-broker@0.1.1-rc.3
+  - @rocket.chat/models@1.0.0-rc.3
+  </details>
+
 ## 0.4.9-rc.2
 
 ### Patch Changes
diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json
index 8aa8902d41f1..fdde9ae58b45 100644
--- a/ee/apps/queue-worker/package.json
+++ b/ee/apps/queue-worker/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/queue-worker",
 	"private": true,
-	"version": "0.4.9-rc.2",
+	"version": "0.4.9-rc.3",
 	"description": "Rocket.Chat service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",
diff --git a/ee/apps/stream-hub-service/CHANGELOG.md b/ee/apps/stream-hub-service/CHANGELOG.md
index a04b851bd289..8585e179eecd 100644
--- a/ee/apps/stream-hub-service/CHANGELOG.md
+++ b/ee/apps/stream-hub-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/stream-hub-service
 
+## 0.4.9-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.3
+  - @rocket.chat/core-services@0.7.1-rc.3
+  - @rocket.chat/model-typings@1.0.0-rc.3
+  - @rocket.chat/network-broker@0.1.1-rc.3
+  - @rocket.chat/models@1.0.0-rc.3
+  </details>
+
 ## 0.4.9-rc.2
 
 ### Patch Changes
diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json
index 264d475b6798..69efc6df3f5d 100644
--- a/ee/apps/stream-hub-service/package.json
+++ b/ee/apps/stream-hub-service/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/stream-hub-service",
 	"private": true,
-	"version": "0.4.9-rc.2",
+	"version": "0.4.9-rc.3",
 	"description": "Rocket.Chat Stream Hub service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",
diff --git a/ee/packages/license/CHANGELOG.md b/ee/packages/license/CHANGELOG.md
index f2ef08dda661..06bcacc17ccc 100644
--- a/ee/packages/license/CHANGELOG.md
+++ b/ee/packages/license/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/license
 
+## 1.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.3
+  </details>
+
 ## 1.0.0-rc.2
 
 ### Patch Changes
diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json
index 5e9ad34fb587..1d9fc2733d7f 100644
--- a/ee/packages/license/package.json
+++ b/ee/packages/license/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/license",
-	"version": "1.0.0-rc.2",
+	"version": "1.0.0-rc.3",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/ee/packages/network-broker/CHANGELOG.md b/ee/packages/network-broker/CHANGELOG.md
index 693cc81d6134..84a7c6ee70c4 100644
--- a/ee/packages/network-broker/CHANGELOG.md
+++ b/ee/packages/network-broker/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/network-broker
 
+## 0.1.1-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-services@0.7.1-rc.3
+  </details>
+
 ## 0.1.1-rc.2
 
 ### Patch Changes
diff --git a/ee/packages/network-broker/package.json b/ee/packages/network-broker/package.json
index 7df734e94a0f..d1cc71733da2 100644
--- a/ee/packages/network-broker/package.json
+++ b/ee/packages/network-broker/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/network-broker",
-	"version": "0.1.1-rc.2",
+	"version": "0.1.1-rc.3",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md
index eac24f84cd56..997a7b8401f2 100644
--- a/ee/packages/omnichannel-services/CHANGELOG.md
+++ b/ee/packages/omnichannel-services/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/omnichannel-services
 
+## 0.3.6-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.3
+  - @rocket.chat/rest-typings@7.0.0-rc.3
+  - @rocket.chat/pdf-worker@0.2.6-rc.3
+  - @rocket.chat/core-services@0.7.1-rc.3
+  - @rocket.chat/model-typings@1.0.0-rc.3
+  - @rocket.chat/models@1.0.0-rc.3
+  </details>
+
 ## 0.3.6-rc.2
 
 ### Patch Changes
diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json
index 9046be3d9f55..5c135d03243e 100644
--- a/ee/packages/omnichannel-services/package.json
+++ b/ee/packages/omnichannel-services/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/omnichannel-services",
-	"version": "0.3.6-rc.2",
+	"version": "0.3.6-rc.3",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
diff --git a/ee/packages/pdf-worker/CHANGELOG.md b/ee/packages/pdf-worker/CHANGELOG.md
index dcb8559ed494..6455f81bbbf4 100644
--- a/ee/packages/pdf-worker/CHANGELOG.md
+++ b/ee/packages/pdf-worker/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/pdf-worker
 
+## 0.2.6-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.3
+  </details>
+
 ## 0.2.6-rc.2
 
 ### Patch Changes
diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json
index 9e5d97d2844c..a5fe9ef3d217 100644
--- a/ee/packages/pdf-worker/package.json
+++ b/ee/packages/pdf-worker/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/pdf-worker",
-	"version": "0.2.6-rc.2",
+	"version": "0.2.6-rc.3",
 	"private": true,
 	"main": "./dist/index.js",
 	"typings": "./dist/index.d.ts",
diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md
index dc38c9f1994c..e57b75ee05ef 100644
--- a/ee/packages/presence/CHANGELOG.md
+++ b/ee/packages/presence/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/presence
 
+## 0.2.9-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.3
+  - @rocket.chat/core-services@0.7.1-rc.3
+  - @rocket.chat/models@1.0.0-rc.3
+  </details>
+
 ## 0.2.9-rc.2
 
 ### Patch Changes
diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json
index 89dd73c65545..f6c909876ea6 100644
--- a/ee/packages/presence/package.json
+++ b/ee/packages/presence/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/presence",
-	"version": "0.2.9-rc.2",
+	"version": "0.2.9-rc.3",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.25.8",
diff --git a/package.json b/package.json
index 3afaa7acf953..31385fc4dc0d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "rocket.chat",
-	"version": "7.0.0-rc.2",
+	"version": "7.0.0-rc.3",
 	"description": "Rocket.Chat Monorepo",
 	"main": "index.js",
 	"private": true,
diff --git a/packages/api-client/CHANGELOG.md b/packages/api-client/CHANGELOG.md
index e56b16abb69d..cf72a20ae7fe 100644
--- a/packages/api-client/CHANGELOG.md
+++ b/packages/api-client/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/api-client
 
+## 0.2.9-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.3
+  - @rocket.chat/rest-typings@7.0.0-rc.3
+  </details>
+
 ## 0.2.9-rc.2
 
 ### Patch Changes
diff --git a/packages/api-client/package.json b/packages/api-client/package.json
index caa6c88b4d40..76d3d1f44d50 100644
--- a/packages/api-client/package.json
+++ b/packages/api-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/api-client",
-	"version": "0.2.9-rc.2",
+	"version": "0.2.9-rc.3",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/jest": "~29.5.13",
diff --git a/packages/apps/CHANGELOG.md b/packages/apps/CHANGELOG.md
index 590ef352c7cd..2e6b840e2142 100644
--- a/packages/apps/CHANGELOG.md
+++ b/packages/apps/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/apps
 
+## 0.2.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.3
+  - @rocket.chat/model-typings@1.0.0-rc.3
+  </details>
+
 ## 0.2.0-rc.2
 
 ### Patch Changes
diff --git a/packages/apps/package.json b/packages/apps/package.json
index 4d213c876799..26db8fbe241b 100644
--- a/packages/apps/package.json
+++ b/packages/apps/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/apps",
-	"version": "0.2.0-rc.2",
+	"version": "0.2.0-rc.3",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md
index 37f39bffb5cf..4f969ddabddd 100644
--- a/packages/core-services/CHANGELOG.md
+++ b/packages/core-services/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/core-services
 
+## 0.7.1-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.3
+  - @rocket.chat/rest-typings@7.0.0-rc.3
+  - @rocket.chat/models@1.0.0-rc.3
+  </details>
+
 ## 0.7.1-rc.2
 
 ### Patch Changes
diff --git a/packages/core-services/package.json b/packages/core-services/package.json
index 6461f4378c15..97a43a683fc6 100644
--- a/packages/core-services/package.json
+++ b/packages/core-services/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/core-services",
-	"version": "0.7.1-rc.2",
+	"version": "0.7.1-rc.3",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.25.8",
diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md
index 35ade27cad53..722b482bf227 100644
--- a/packages/core-typings/CHANGELOG.md
+++ b/packages/core-typings/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @rocket.chat/core-typings
 
+## 7.0.0-rc.3
+
 ## 7.0.0-rc.2
 
 ## 7.0.0-rc.1
diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json
index fbc844b9a992..250ac7cd4c2a 100644
--- a/packages/core-typings/package.json
+++ b/packages/core-typings/package.json
@@ -2,7 +2,7 @@
 	"$schema": "https://json.schemastore.org/package",
 	"name": "@rocket.chat/core-typings",
 	"private": true,
-	"version": "7.0.0-rc.2",
+	"version": "7.0.0-rc.3",
 	"devDependencies": {
 		"@rocket.chat/apps-engine": "workspace:^",
 		"@rocket.chat/eslint-config": "workspace:^",
diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md
index d940035b4a0a..4ca2dea1a48c 100644
--- a/packages/cron/CHANGELOG.md
+++ b/packages/cron/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/cron
 
+## 0.1.9-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.3
+  - @rocket.chat/models@1.0.0-rc.3
+  </details>
+
 ## 0.1.9-rc.2
 
 ### Patch Changes
diff --git a/packages/cron/package.json b/packages/cron/package.json
index 1fced5836b56..833fc0638dfa 100644
--- a/packages/cron/package.json
+++ b/packages/cron/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/cron",
-	"version": "0.1.9-rc.2",
+	"version": "0.1.9-rc.3",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/ddp-client/CHANGELOG.md b/packages/ddp-client/CHANGELOG.md
index d3784ec7f943..d1f900a25efe 100644
--- a/packages/ddp-client/CHANGELOG.md
+++ b/packages/ddp-client/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ddp-client
 
+## 0.3.9-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.3
+  - @rocket.chat/rest-typings@7.0.0-rc.3
+  - @rocket.chat/api-client@0.2.9-rc.3
+  </details>
+
 ## 0.3.9-rc.2
 
 ### Patch Changes
diff --git a/packages/ddp-client/package.json b/packages/ddp-client/package.json
index fa5acd8ee51f..904fc7b1b075 100644
--- a/packages/ddp-client/package.json
+++ b/packages/ddp-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ddp-client",
-	"version": "0.3.9-rc.2",
+	"version": "0.3.9-rc.3",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/jest": "~29.5.13",
diff --git a/packages/freeswitch/CHANGELOG.md b/packages/freeswitch/CHANGELOG.md
index c1905c5a5979..ed60ac56c645 100644
--- a/packages/freeswitch/CHANGELOG.md
+++ b/packages/freeswitch/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/freeswitch
 
+## 1.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.3
+  </details>
+
 ## 1.0.0-rc.2
 
 ### Patch Changes
diff --git a/packages/freeswitch/package.json b/packages/freeswitch/package.json
index 376108bab0ad..f4362426a0f6 100644
--- a/packages/freeswitch/package.json
+++ b/packages/freeswitch/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/freeswitch",
-	"version": "1.0.0-rc.2",
+	"version": "1.0.0-rc.3",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md
index df0ce069ab33..078efc4715c3 100644
--- a/packages/fuselage-ui-kit/CHANGELOG.md
+++ b/packages/fuselage-ui-kit/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Change Log
 
+## 12.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.3
+  - @rocket.chat/gazzodown@12.0.0-rc.3
+  - @rocket.chat/ui-contexts@12.0.0-rc.3
+  - @rocket.chat/ui-avatar@8.0.0-rc.3
+  - @rocket.chat/ui-video-conf@12.0.0-rc.3
+  </details>
+
 ## 12.0.0-rc.2
 
 ### Patch Changes
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index eb50d9e5a150..56fa8c324666 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/fuselage-ui-kit",
-	"version": "12.0.0-rc.2",
+	"version": "12.0.0-rc.3",
 	"private": true,
 	"description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system",
 	"homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/",
@@ -101,10 +101,10 @@
 		"@rocket.chat/icons": "*",
 		"@rocket.chat/prettier-config": "*",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-avatar": "8.0.0-rc.2",
-		"@rocket.chat/ui-contexts": "12.0.0-rc.2",
+		"@rocket.chat/ui-avatar": "8.0.0-rc.3",
+		"@rocket.chat/ui-contexts": "12.0.0-rc.3",
 		"@rocket.chat/ui-kit": "0.37.0-rc.0",
-		"@rocket.chat/ui-video-conf": "12.0.0-rc.2",
+		"@rocket.chat/ui-video-conf": "12.0.0-rc.3",
 		"@tanstack/react-query": "*",
 		"react": "~17.0.2",
 		"react-dom": "*"
diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md
index da317aade28d..58f2357ec2de 100644
--- a/packages/gazzodown/CHANGELOG.md
+++ b/packages/gazzodown/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/gazzodown
 
+## 12.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.3
+  - @rocket.chat/ui-contexts@12.0.0-rc.3
+  - @rocket.chat/ui-client@12.0.0-rc.3
+  </details>
+
 ## 12.0.0-rc.2
 
 ### Patch Changes
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index 7ac29d9b8387..3207e71b022c 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/gazzodown",
-	"version": "12.0.0-rc.2",
+	"version": "12.0.0-rc.3",
 	"private": true,
 	"main": "./dist/index.js",
 	"typings": "./dist/index.d.ts",
@@ -75,8 +75,8 @@
 		"@rocket.chat/fuselage-tokens": "*",
 		"@rocket.chat/message-parser": "0.31.31",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-client": "12.0.0-rc.2",
-		"@rocket.chat/ui-contexts": "12.0.0-rc.2",
+		"@rocket.chat/ui-client": "12.0.0-rc.3",
+		"@rocket.chat/ui-contexts": "12.0.0-rc.3",
 		"katex": "*",
 		"react": "*"
 	},
diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md
index df55f1a30e15..1dfec3d3d92f 100644
--- a/packages/instance-status/CHANGELOG.md
+++ b/packages/instance-status/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/instance-status
 
+## 0.1.9-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/models@1.0.0-rc.3
+  </details>
+
 ## 0.1.9-rc.2
 
 ### Patch Changes
diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json
index 01a5cd758525..05a5d3899e9a 100644
--- a/packages/instance-status/package.json
+++ b/packages/instance-status/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/instance-status",
-	"version": "0.1.9-rc.2",
+	"version": "0.1.9-rc.3",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md
index 413396856655..c87095501486 100644
--- a/packages/livechat/CHANGELOG.md
+++ b/packages/livechat/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/livechat Change Log
 
+## 1.20.1-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/gazzodown@12.0.0-rc.3
+  </details>
+
 ## 1.20.1-rc.2
 
 ### Patch Changes
diff --git a/packages/livechat/package.json b/packages/livechat/package.json
index c5affb93aa2a..dab0fe2c0a90 100644
--- a/packages/livechat/package.json
+++ b/packages/livechat/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/livechat",
-	"version": "1.20.1-rc.2",
+	"version": "1.20.1-rc.3",
 	"files": [
 		"/build"
 	],
diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md
index 5b5bb17cc673..29bba8c7605c 100644
--- a/packages/model-typings/CHANGELOG.md
+++ b/packages/model-typings/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/model-typings
 
+## 1.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.3
+  </details>
+
 ## 1.0.0-rc.2
 
 ### Patch Changes
diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json
index 75cb376bba91..5d81916a6bb1 100644
--- a/packages/model-typings/package.json
+++ b/packages/model-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/model-typings",
-	"version": "1.0.0-rc.2",
+	"version": "1.0.0-rc.3",
 	"private": true,
 	"devDependencies": {
 		"@types/node-rsa": "^1.1.4",
diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md
index 897dbca44163..9778f5366e8e 100644
--- a/packages/models/CHANGELOG.md
+++ b/packages/models/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/models
 
+## 1.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/model-typings@1.0.0-rc.3
+  </details>
+
 ## 1.0.0-rc.2
 
 ### Patch Changes
diff --git a/packages/models/package.json b/packages/models/package.json
index f138766a4dd3..58c96184b345 100644
--- a/packages/models/package.json
+++ b/packages/models/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/models",
-	"version": "1.0.0-rc.2",
+	"version": "1.0.0-rc.3",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md
index b10699809231..9c320da06e8b 100644
--- a/packages/rest-typings/CHANGELOG.md
+++ b/packages/rest-typings/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/rest-typings
 
+## 7.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.3
+  </details>
+
 ## 7.0.0-rc.2
 
 ### Patch Changes
diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json
index 6cda18ade614..624c7c254c53 100644
--- a/packages/rest-typings/package.json
+++ b/packages/rest-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/rest-typings",
-	"version": "7.0.0-rc.2",
+	"version": "7.0.0-rc.3",
 	"devDependencies": {
 		"@rocket.chat/apps-engine": "workspace:^",
 		"@rocket.chat/eslint-config": "workspace:~",
diff --git a/packages/ui-avatar/CHANGELOG.md b/packages/ui-avatar/CHANGELOG.md
index 69b982da2b70..a8931e77564f 100644
--- a/packages/ui-avatar/CHANGELOG.md
+++ b/packages/ui-avatar/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/ui-avatar
 
+## 8.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@12.0.0-rc.3
+  </details>
+
 ## 8.0.0-rc.2
 
 ### Patch Changes
diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json
index 4eeeb05e9956..188b5cba0e47 100644
--- a/packages/ui-avatar/package.json
+++ b/packages/ui-avatar/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-avatar",
-	"version": "8.0.0-rc.2",
+	"version": "8.0.0-rc.3",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.25.8",
@@ -30,7 +30,7 @@
 	],
 	"peerDependencies": {
 		"@rocket.chat/fuselage": "*",
-		"@rocket.chat/ui-contexts": "12.0.0-rc.2",
+		"@rocket.chat/ui-contexts": "12.0.0-rc.3",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md
index 2c467a91aff2..cee0baffbac0 100644
--- a/packages/ui-client/CHANGELOG.md
+++ b/packages/ui-client/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/ui-client
 
+## 12.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@12.0.0-rc.3
+  - @rocket.chat/ui-avatar@8.0.0-rc.3
+  </details>
+
 ## 12.0.0-rc.2
 
 ### Patch Changes
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index 4811cdbd44b5..94684b465d05 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-client",
-	"version": "12.0.0-rc.2",
+	"version": "12.0.0-rc.3",
 	"private": true,
 	"main": "./dist/index.js",
 	"typings": "./dist/index.d.ts",
@@ -60,8 +60,8 @@
 		"@rocket.chat/fuselage": "*",
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
-		"@rocket.chat/ui-avatar": "8.0.0-rc.2",
-		"@rocket.chat/ui-contexts": "12.0.0-rc.2",
+		"@rocket.chat/ui-avatar": "8.0.0-rc.3",
+		"@rocket.chat/ui-contexts": "12.0.0-rc.3",
 		"react": "*",
 		"react-i18next": "*"
 	},
diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md
index cd3a2999445d..674ccf92fa78 100644
--- a/packages/ui-contexts/CHANGELOG.md
+++ b/packages/ui-contexts/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ui-contexts
 
+## 12.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.3
+  - @rocket.chat/rest-typings@7.0.0-rc.3
+  - @rocket.chat/ddp-client@0.3.9-rc.3
+  </details>
+
 ## 12.0.0-rc.2
 
 ### Patch Changes
diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json
index 2be1327ded89..82d74e0e221e 100644
--- a/packages/ui-contexts/package.json
+++ b/packages/ui-contexts/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-contexts",
-	"version": "12.0.0-rc.2",
+	"version": "12.0.0-rc.3",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/core-typings": "workspace:^",
diff --git a/packages/ui-video-conf/CHANGELOG.md b/packages/ui-video-conf/CHANGELOG.md
index ea3fb9a440eb..78fb1ed355db 100644
--- a/packages/ui-video-conf/CHANGELOG.md
+++ b/packages/ui-video-conf/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/ui-video-conf
 
+## 12.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@12.0.0-rc.3
+  - @rocket.chat/ui-avatar@8.0.0-rc.3
+  </details>
+
 ## 12.0.0-rc.2
 
 ### Patch Changes
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index 4d15b5745c12..9b063ed2dd20 100644
--- a/packages/ui-video-conf/package.json
+++ b/packages/ui-video-conf/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-video-conf",
-	"version": "12.0.0-rc.2",
+	"version": "12.0.0-rc.3",
 	"private": true,
 	"main": "./dist/index.js",
 	"typings": "./dist/index.d.ts",
@@ -58,8 +58,8 @@
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-avatar": "8.0.0-rc.2",
-		"@rocket.chat/ui-contexts": "12.0.0-rc.2",
+		"@rocket.chat/ui-avatar": "8.0.0-rc.3",
+		"@rocket.chat/ui-contexts": "12.0.0-rc.3",
 		"react": "~17.0.2",
 		"react-dom": "^17.0.2"
 	},
diff --git a/packages/ui-voip/CHANGELOG.md b/packages/ui-voip/CHANGELOG.md
index 5bb5779af93e..08dcddb94073 100644
--- a/packages/ui-voip/CHANGELOG.md
+++ b/packages/ui-voip/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ui-voip
 
+## 2.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@12.0.0-rc.3
+  - @rocket.chat/ui-avatar@8.0.0-rc.3
+  - @rocket.chat/ui-client@12.0.0-rc.3
+  </details>
+
 ## 2.0.0-rc.2
 
 ### Patch Changes
diff --git a/packages/ui-voip/package.json b/packages/ui-voip/package.json
index 3bf8cc37151a..a6b46d6e436c 100644
--- a/packages/ui-voip/package.json
+++ b/packages/ui-voip/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-voip",
-	"version": "2.0.0-rc.2",
+	"version": "2.0.0-rc.3",
 	"private": true,
 	"main": "./dist/index.js",
 	"typings": "./dist/index.d.ts",
@@ -65,9 +65,9 @@
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-avatar": "8.0.0-rc.2",
-		"@rocket.chat/ui-client": "12.0.0-rc.2",
-		"@rocket.chat/ui-contexts": "12.0.0-rc.2",
+		"@rocket.chat/ui-avatar": "8.0.0-rc.3",
+		"@rocket.chat/ui-client": "12.0.0-rc.3",
+		"@rocket.chat/ui-contexts": "12.0.0-rc.3",
 		"react": "~17.0.2",
 		"react-aria": "~3.23.1",
 		"react-dom": "^17.0.2"
diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md
index c19d639a683a..4b1b4e7adf1f 100644
--- a/packages/web-ui-registration/CHANGELOG.md
+++ b/packages/web-ui-registration/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/web-ui-registration
 
+## 12.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@12.0.0-rc.3
+  </details>
+
 ## 12.0.0-rc.2
 
 ### Patch Changes
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index 7c723b6c104f..1a67d0c9a0c8 100644
--- a/packages/web-ui-registration/package.json
+++ b/packages/web-ui-registration/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/web-ui-registration",
-	"version": "12.0.0-rc.2",
+	"version": "12.0.0-rc.3",
 	"private": true,
 	"homepage": "https://rocket.chat",
 	"main": "./dist/index.js",
@@ -49,7 +49,7 @@
 	"peerDependencies": {
 		"@rocket.chat/layout": "*",
 		"@rocket.chat/tools": "0.2.2",
-		"@rocket.chat/ui-contexts": "12.0.0-rc.2",
+		"@rocket.chat/ui-contexts": "12.0.0-rc.3",
 		"@tanstack/react-query": "*",
 		"react": "*",
 		"react-hook-form": "*",
diff --git a/yarn.lock b/yarn.lock
index faf10e19571a..a625b3a04498 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8518,10 +8518,10 @@ __metadata:
     "@rocket.chat/icons": "*"
     "@rocket.chat/prettier-config": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 8.0.0-rc.1
-    "@rocket.chat/ui-contexts": 12.0.0-rc.1
+    "@rocket.chat/ui-avatar": 8.0.0-rc.2
+    "@rocket.chat/ui-contexts": 12.0.0-rc.2
     "@rocket.chat/ui-kit": 0.37.0-rc.0
-    "@rocket.chat/ui-video-conf": 12.0.0-rc.1
+    "@rocket.chat/ui-video-conf": 12.0.0-rc.2
     "@tanstack/react-query": "*"
     react: ~17.0.2
     react-dom: "*"
@@ -8607,8 +8607,8 @@ __metadata:
     "@rocket.chat/fuselage-tokens": "*"
     "@rocket.chat/message-parser": 0.31.31
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-client": 12.0.0-rc.1
-    "@rocket.chat/ui-contexts": 12.0.0-rc.1
+    "@rocket.chat/ui-client": 12.0.0-rc.2
+    "@rocket.chat/ui-contexts": 12.0.0-rc.2
     katex: "*"
     react: "*"
   languageName: unknown
@@ -9860,7 +9860,7 @@ __metadata:
     typescript: "npm:~5.6.3"
   peerDependencies:
     "@rocket.chat/fuselage": "*"
-    "@rocket.chat/ui-contexts": 12.0.0-rc.1
+    "@rocket.chat/ui-contexts": 12.0.0-rc.2
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -9910,8 +9910,8 @@ __metadata:
     "@rocket.chat/fuselage": "*"
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
-    "@rocket.chat/ui-avatar": 8.0.0-rc.1
-    "@rocket.chat/ui-contexts": 12.0.0-rc.1
+    "@rocket.chat/ui-avatar": 8.0.0-rc.2
+    "@rocket.chat/ui-contexts": 12.0.0-rc.2
     react: "*"
     react-i18next: "*"
   languageName: unknown
@@ -10081,8 +10081,8 @@ __metadata:
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 8.0.0-rc.1
-    "@rocket.chat/ui-contexts": 12.0.0-rc.1
+    "@rocket.chat/ui-avatar": 8.0.0-rc.2
+    "@rocket.chat/ui-contexts": 12.0.0-rc.2
     react: ~17.0.2
     react-dom: ^17.0.2
   languageName: unknown
@@ -10136,9 +10136,9 @@ __metadata:
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 8.0.0-rc.1
-    "@rocket.chat/ui-client": 12.0.0-rc.1
-    "@rocket.chat/ui-contexts": 12.0.0-rc.1
+    "@rocket.chat/ui-avatar": 8.0.0-rc.2
+    "@rocket.chat/ui-client": 12.0.0-rc.2
+    "@rocket.chat/ui-contexts": 12.0.0-rc.2
     react: ~17.0.2
     react-aria: ~3.23.1
     react-dom: ^17.0.2
@@ -10227,7 +10227,7 @@ __metadata:
   peerDependencies:
     "@rocket.chat/layout": "*"
     "@rocket.chat/tools": 0.2.2
-    "@rocket.chat/ui-contexts": 12.0.0-rc.1
+    "@rocket.chat/ui-contexts": 12.0.0-rc.2
     "@tanstack/react-query": "*"
     react: "*"
     react-hook-form: "*"

From dd3ee235b7153a7203068711bb287b2166898aa3 Mon Sep 17 00:00:00 2001
From: Kevin Aleman <kaleman960@gmail.com>
Date: Thu, 24 Oct 2024 08:39:38 -0600
Subject: [PATCH 07/22] regression: Remove user from waiting queue when the key
 is set via `updateGroupKey` (#33696)

---
 .../app/e2e/server/methods/updateGroupKey.ts  | 61 +++++++++++-------
 .../e2e/server/methods/updateGroupKey.spec.ts | 63 +++++++++++++++++++
 2 files changed, 102 insertions(+), 22 deletions(-)
 create mode 100644 apps/meteor/tests/unit/app/e2e/server/methods/updateGroupKey.spec.ts

diff --git a/apps/meteor/app/e2e/server/methods/updateGroupKey.ts b/apps/meteor/app/e2e/server/methods/updateGroupKey.ts
index 6974ba225d9f..5f7860107bd9 100644
--- a/apps/meteor/app/e2e/server/methods/updateGroupKey.ts
+++ b/apps/meteor/app/e2e/server/methods/updateGroupKey.ts
@@ -1,9 +1,13 @@
 import type { ServerMethods } from '@rocket.chat/ddp-client';
-import { Subscriptions } from '@rocket.chat/models';
+import { Subscriptions, Rooms } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
 
 import { methodDeprecationLogger } from '../../../lib/server/lib/deprecationWarningLogger';
-import { notifyOnSubscriptionChangedById, notifyOnSubscriptionChanged } from '../../../lib/server/lib/notifyListener';
+import {
+	notifyOnSubscriptionChangedById,
+	notifyOnSubscriptionChanged,
+	notifyOnRoomChangedById,
+} from '../../../lib/server/lib/notifyListener';
 
 declare module '@rocket.chat/ddp-client' {
 	// eslint-disable-next-line @typescript-eslint/naming-convention
@@ -12,32 +16,45 @@ declare module '@rocket.chat/ddp-client' {
 	}
 }
 
+export async function updateGroupKey(rid: string, uid: string, key: string, callerUserId: string) {
+	// I have a subscription to this room
+	const mySub = await Subscriptions.findOneByRoomIdAndUserId(rid, callerUserId);
+
+	if (mySub) {
+		// Setting the key to myself, can set directly to the final field
+		if (callerUserId === uid) {
+			const setGroupE2EKeyResponse = await Subscriptions.setGroupE2EKey(mySub._id, key);
+			// Case: I create an encrypted room before setting up my keys, and I reset the e2e keys
+			// Next login, I'll create the keys for the room, and set them here.
+			// However as I reset my keys, I'm on the `usersWaitingForKeys` queue
+			// So I need to remove myself from the queue and notify the time i reach here
+			// This way, I can provide the keys to other users
+			const { modifiedCount } = await Rooms.removeUsersFromE2EEQueueByRoomId(mySub.rid, [callerUserId]);
+			if (setGroupE2EKeyResponse.modifiedCount) {
+				void notifyOnSubscriptionChangedById(mySub._id);
+			}
+			if (modifiedCount) {
+				void notifyOnRoomChangedById(mySub.rid);
+			}
+			return;
+		}
+
+		// uid also has subscription to this room
+		const { value } = await Subscriptions.setGroupE2ESuggestedKey(uid, rid, key);
+		if (value) {
+			void notifyOnSubscriptionChanged(value);
+		}
+	}
+}
+
 Meteor.methods<ServerMethods>({
 	async 'e2e.updateGroupKey'(rid, uid, key) {
-		methodDeprecationLogger.method('e2e.updateGroupKey', '8.0.0');
 		const userId = Meteor.userId();
 		if (!userId) {
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'e2e.acceptSuggestedGroupKey' });
 		}
 
-		// I have a subscription to this room
-		const mySub = await Subscriptions.findOneByRoomIdAndUserId(rid, userId);
-
-		if (mySub) {
-			// Setting the key to myself, can set directly to the final field
-			if (userId === uid) {
-				const setGroupE2EKeyResponse = await Subscriptions.setGroupE2EKey(mySub._id, key);
-				if (setGroupE2EKeyResponse.modifiedCount) {
-					void notifyOnSubscriptionChangedById(mySub._id);
-				}
-				return;
-			}
-
-			// uid also has subscription to this room
-			const { value } = await Subscriptions.setGroupE2ESuggestedKey(uid, rid, key);
-			if (value) {
-				void notifyOnSubscriptionChanged(value);
-			}
-		}
+		methodDeprecationLogger.method('e2e.updateGroupKey', '8.0.0');
+		return updateGroupKey(rid, uid, key, userId);
 	},
 });
diff --git a/apps/meteor/tests/unit/app/e2e/server/methods/updateGroupKey.spec.ts b/apps/meteor/tests/unit/app/e2e/server/methods/updateGroupKey.spec.ts
new file mode 100644
index 000000000000..9df3b2ab654d
--- /dev/null
+++ b/apps/meteor/tests/unit/app/e2e/server/methods/updateGroupKey.spec.ts
@@ -0,0 +1,63 @@
+import { expect } from 'chai';
+import { beforeEach, describe, it } from 'mocha';
+import proxyquire from 'proxyquire';
+import sinon from 'sinon';
+
+const models = {
+	Subscriptions: {
+		findOneByRoomIdAndUserId: sinon.stub(),
+		setGroupE2EKey: sinon.stub(),
+		setGroupE2ESuggestedKey: sinon.stub(),
+	},
+	Rooms: {
+		removeUsersFromE2EEQueueByRoomId: sinon.stub(),
+	},
+};
+
+const { updateGroupKey } = proxyquire.noCallThru().load('../../../../../../app/e2e/server/methods/updateGroupKey.ts', {
+	'../../../lib/server/lib/notifyListener': {
+		notifyOnSubscriptionChanged: sinon.stub(),
+		notifyOnRoomChangedById: sinon.stub(),
+		notifyOnSubscriptionChangedById: sinon.stub(),
+	},
+	'../../../lib/server/lib/deprecationWarningLogger': {
+		methodDeprecationLogger: {
+			method: sinon.stub(),
+		},
+	},
+	'@rocket.chat/models': models,
+	'meteor/meteor': { Meteor: { methods: sinon.stub() } },
+});
+
+describe('updateGroupKey', () => {
+	beforeEach(() => {
+		models.Subscriptions.findOneByRoomIdAndUserId.reset();
+		models.Subscriptions.setGroupE2EKey.reset();
+		models.Subscriptions.setGroupE2ESuggestedKey.reset();
+	});
+
+	it('should do nothing if user has no subscription', async () => {
+		models.Subscriptions.findOneByRoomIdAndUserId.resolves(null);
+		const res = await updateGroupKey('rid', 'uid', 'key', 'callerUserId');
+
+		expect(res).to.be.undefined;
+	});
+	it('should suggest the key to the user when uid is different from callerUserId', async () => {
+		models.Subscriptions.findOneByRoomIdAndUserId.resolves({ _id: 'subscriptionId' });
+		models.Subscriptions.setGroupE2ESuggestedKey.resolves({ value: {} });
+		const res = await updateGroupKey('rid', 'uid', 'key', 'callerUserId');
+
+		expect(res).to.be.undefined;
+		expect(models.Subscriptions.setGroupE2ESuggestedKey.calledOnce).to.be.true;
+	});
+	it('should set the group key when uid is the callerUserId', async () => {
+		models.Subscriptions.findOneByRoomIdAndUserId.resolves({ _id: 'subscriptionId' });
+		models.Subscriptions.setGroupE2EKey.resolves({ modifiedCount: 1 });
+		models.Rooms.removeUsersFromE2EEQueueByRoomId.resolves({ modifiedCount: 1 });
+		const res = await updateGroupKey('rid', 'uid', 'key', 'uid');
+
+		expect(res).to.be.undefined;
+		expect(models.Subscriptions.setGroupE2EKey.calledOnce).to.be.true;
+		expect(models.Rooms.removeUsersFromE2EEQueueByRoomId.calledOnce).to.be.true;
+	});
+});

From c884d3b489796905da8d9863ead037fc3a105bba Mon Sep 17 00:00:00 2001
From: Hugo Costa <hugocarreiracosta@gmail.com>
Date: Thu, 24 Oct 2024 11:47:30 -0300
Subject: [PATCH 08/22] regression: Fix meteor dynamic storage for E2EE client
 (#33711)

---
 apps/meteor/client/views/account/security/EndToEnd.tsx    | 5 +++--
 apps/meteor/client/views/room/E2EESetup/RoomE2EESetup.tsx | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/meteor/client/views/account/security/EndToEnd.tsx b/apps/meteor/client/views/account/security/EndToEnd.tsx
index 5546cbd00a88..d2c3865d891b 100644
--- a/apps/meteor/client/views/account/security/EndToEnd.tsx
+++ b/apps/meteor/client/views/account/security/EndToEnd.tsx
@@ -1,6 +1,7 @@
 import { Box, PasswordInput, Field, FieldGroup, FieldLabel, FieldRow, FieldError, FieldHint, Button, Divider } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import { useToastMessageDispatch, useMethod, useTranslation, useLogout } from '@rocket.chat/ui-contexts';
+import { Accounts } from 'meteor/accounts-base';
 import type { ComponentProps, ReactElement } from 'react';
 import React, { useCallback, useEffect } from 'react';
 import { Controller, useForm } from 'react-hook-form';
@@ -12,8 +13,8 @@ const EndToEnd = (props: ComponentProps<typeof Box>): ReactElement => {
 	const dispatchToastMessage = useToastMessageDispatch();
 	const logout = useLogout();
 
-	const publicKey = localStorage.getItem('public_key');
-	const privateKey = localStorage.getItem('private_key');
+	const publicKey = Accounts.storageLocation.getItem('public_key');
+	const privateKey = Accounts.storageLocation.getItem('private_key');
 
 	const resetE2eKey = useMethod('e2e.resetOwnE2EKey');
 
diff --git a/apps/meteor/client/views/room/E2EESetup/RoomE2EESetup.tsx b/apps/meteor/client/views/room/E2EESetup/RoomE2EESetup.tsx
index c3319ac32c4b..7a9ca6772472 100644
--- a/apps/meteor/client/views/room/E2EESetup/RoomE2EESetup.tsx
+++ b/apps/meteor/client/views/room/E2EESetup/RoomE2EESetup.tsx
@@ -1,4 +1,5 @@
 import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '@rocket.chat/ui-client';
+import { Accounts } from 'meteor/accounts-base';
 import React, { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -19,7 +20,7 @@ const RoomE2EESetup = () => {
 	const e2eRoomState = useE2EERoomState(room._id);
 
 	const { t } = useTranslation();
-	const randomPassword = window.localStorage.getItem('e2e.randomPassword');
+	const randomPassword = Accounts.storageLocation.getItem('e2e.randomPassword');
 
 	const onSavePassword = useCallback(() => {
 		if (!randomPassword) {

From ccaa3151e634dd7e979512029e12b47d13a34871 Mon Sep 17 00:00:00 2001
From: Aleksander Nicacio da Silva <aleksander.silva@rocket.chat>
Date: Thu, 24 Oct 2024 12:06:17 -0300
Subject: [PATCH 09/22] regression: voip action button using default instead of
 secondary variant (#33729)

---
 .../VoipActionButton/VoipActionButton.tsx     |  2 +-
 .../VoipActionButton.spec.tsx.snap            |  2 +-
 .../__snapshots__/VoipActions.spec.tsx.snap   | 22 +++++++++----------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/packages/ui-voip/src/components/VoipActionButton/VoipActionButton.tsx b/packages/ui-voip/src/components/VoipActionButton/VoipActionButton.tsx
index a10084934cd4..249582107b5f 100644
--- a/packages/ui-voip/src/components/VoipActionButton/VoipActionButton.tsx
+++ b/packages/ui-voip/src/components/VoipActionButton/VoipActionButton.tsx
@@ -11,9 +11,9 @@ type ActionButtonProps = Pick<ComponentPropsWithoutRef<typeof IconButton>, 'clas
 const VoipActionButton = ({ disabled, label, pressed, icon, danger, success, className, onClick }: ActionButtonProps) => (
 	<IconButton
 		medium
+		secondary
 		danger={danger}
 		success={success}
-		secondary={success || danger}
 		className={className}
 		icon={<Icon name={icon} />}
 		title={label}
diff --git a/packages/ui-voip/src/components/VoipActionButton/__snapshots__/VoipActionButton.spec.tsx.snap b/packages/ui-voip/src/components/VoipActionButton/__snapshots__/VoipActionButton.spec.tsx.snap
index 2f4b29aa9de8..516c82d68465 100644
--- a/packages/ui-voip/src/components/VoipActionButton/__snapshots__/VoipActionButton.spec.tsx.snap
+++ b/packages/ui-voip/src/components/VoipActionButton/__snapshots__/VoipActionButton.spec.tsx.snap
@@ -25,7 +25,7 @@ exports[`renders NeutralButton without crashing 1`] = `
   <div>
     <button
       aria-label="Neutral Button"
-      class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--square rcx-button--icon rcx-button"
+      class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--icon-secondary rcx-button--square rcx-button--icon rcx-button"
       title="Neutral Button"
       type="button"
     >
diff --git a/packages/ui-voip/src/components/VoipActions/__snapshots__/VoipActions.spec.tsx.snap b/packages/ui-voip/src/components/VoipActions/__snapshots__/VoipActions.spec.tsx.snap
index 093545e64d05..b75d8457b899 100644
--- a/packages/ui-voip/src/components/VoipActions/__snapshots__/VoipActions.spec.tsx.snap
+++ b/packages/ui-voip/src/components/VoipActions/__snapshots__/VoipActions.spec.tsx.snap
@@ -22,7 +22,7 @@ exports[`renders IncomingActions without crashing 1`] = `
       </button>
       <button
         aria-label="Turn_off_microphone"
-        class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--square rcx-button--icon rcx-button  rcx-button-group__item"
+        class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--icon-secondary rcx-button--square rcx-button--icon rcx-button  rcx-button-group__item"
         disabled=""
         title="Turn_off_microphone"
         type="button"
@@ -36,7 +36,7 @@ exports[`renders IncomingActions without crashing 1`] = `
       </button>
       <button
         aria-label="Open_Dialpad"
-        class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--square rcx-button--icon rcx-button  rcx-button-group__item"
+        class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--icon-secondary rcx-button--square rcx-button--icon rcx-button  rcx-button-group__item"
         disabled=""
         title="Open_Dialpad"
         type="button"
@@ -50,7 +50,7 @@ exports[`renders IncomingActions without crashing 1`] = `
       </button>
       <button
         aria-label="Transfer_call"
-        class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--square rcx-button--icon rcx-button  rcx-button-group__item"
+        class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--icon-secondary rcx-button--square rcx-button--icon rcx-button  rcx-button-group__item"
         disabled=""
         title="Transfer_call"
         type="button"
@@ -89,7 +89,7 @@ exports[`renders OngoingActions without crashing 1`] = `
     >
       <button
         aria-label="Turn_off_microphone"
-        class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--square rcx-button--icon rcx-button  rcx-button-group__item"
+        class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--icon-secondary rcx-button--square rcx-button--icon rcx-button  rcx-button-group__item"
         title="Turn_off_microphone"
         type="button"
       >
@@ -102,7 +102,7 @@ exports[`renders OngoingActions without crashing 1`] = `
       </button>
       <button
         aria-label="Hold"
-        class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--square rcx-button--icon rcx-button  rcx-button-group__item"
+        class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--icon-secondary rcx-button--square rcx-button--icon rcx-button  rcx-button-group__item"
         title="Hold"
         type="button"
       >
@@ -115,7 +115,7 @@ exports[`renders OngoingActions without crashing 1`] = `
       </button>
       <button
         aria-label="Open_Dialpad"
-        class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--square rcx-button--icon rcx-button  rcx-button-group__item"
+        class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--icon-secondary rcx-button--square rcx-button--icon rcx-button  rcx-button-group__item"
         title="Open_Dialpad"
         type="button"
       >
@@ -128,7 +128,7 @@ exports[`renders OngoingActions without crashing 1`] = `
       </button>
       <button
         aria-label="Transfer_call"
-        class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--square rcx-button--icon rcx-button  rcx-button-group__item"
+        class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--icon-secondary rcx-button--square rcx-button--icon rcx-button  rcx-button-group__item"
         title="Transfer_call"
         type="button"
       >
@@ -166,7 +166,7 @@ exports[`renders OutgoingActions without crashing 1`] = `
     >
       <button
         aria-label="Turn_off_microphone"
-        class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--square rcx-button--icon rcx-button  rcx-button-group__item"
+        class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--icon-secondary rcx-button--square rcx-button--icon rcx-button  rcx-button-group__item"
         disabled=""
         title="Turn_off_microphone"
         type="button"
@@ -180,7 +180,7 @@ exports[`renders OutgoingActions without crashing 1`] = `
       </button>
       <button
         aria-label="Hold"
-        class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--square rcx-button--icon rcx-button  rcx-button-group__item"
+        class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--icon-secondary rcx-button--square rcx-button--icon rcx-button  rcx-button-group__item"
         disabled=""
         title="Hold"
         type="button"
@@ -194,7 +194,7 @@ exports[`renders OutgoingActions without crashing 1`] = `
       </button>
       <button
         aria-label="Open_Dialpad"
-        class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--square rcx-button--icon rcx-button  rcx-button-group__item"
+        class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--icon-secondary rcx-button--square rcx-button--icon rcx-button  rcx-button-group__item"
         disabled=""
         title="Open_Dialpad"
         type="button"
@@ -208,7 +208,7 @@ exports[`renders OutgoingActions without crashing 1`] = `
       </button>
       <button
         aria-label="Transfer_call"
-        class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--square rcx-button--icon rcx-button  rcx-button-group__item"
+        class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--icon-secondary rcx-button--square rcx-button--icon rcx-button  rcx-button-group__item"
         disabled=""
         title="Transfer_call"
         type="button"

From 349e646367929a955433ce51c51ec6a64127b99a Mon Sep 17 00:00:00 2001
From: Ricardo Garim <rswarovsky@gmail.com>
Date: Thu, 24 Oct 2024 14:32:41 -0300
Subject: [PATCH 10/22] regression: add tracing instrumentation on LocalBroker
 (#33750)

---
 packages/core-services/src/LocalBroker.ts | 24 ++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/packages/core-services/src/LocalBroker.ts b/packages/core-services/src/LocalBroker.ts
index 451ced1cf39f..28aa0bc4fc80 100644
--- a/packages/core-services/src/LocalBroker.ts
+++ b/packages/core-services/src/LocalBroker.ts
@@ -1,6 +1,7 @@
 import { EventEmitter } from 'events';
 
 import { InstanceStatus } from '@rocket.chat/models';
+import { injectCurrentContext, tracerActiveSpan } from '@rocket.chat/tracing';
 
 import { asyncLocalStorage } from '.';
 import type { EventSignatures } from './events/Events';
@@ -17,17 +18,22 @@ export class LocalBroker implements IBroker {
 	private services = new Set<IServiceClass>();
 
 	async call(method: string, data: any): Promise<any> {
-		const result = await asyncLocalStorage.run(
-			{
-				id: 'ctx.id',
-				nodeID: 'ctx.nodeID',
-				requestID: 'ctx.requestID',
-				broker: this,
+		return tracerActiveSpan(
+			`action ${method}`,
+			{},
+			() => {
+				return asyncLocalStorage.run(
+					{
+						id: 'ctx.id',
+						nodeID: 'ctx.nodeID',
+						requestID: 'ctx.requestID',
+						broker: this,
+					},
+					(): any => this.methods.get(method)?.(...data),
+				);
 			},
-			(): any => this.methods.get(method)?.(...data),
+			injectCurrentContext(),
 		);
-
-		return result;
 	}
 
 	async waitAndCall(method: string, data: any): Promise<any> {

From c2b92f4e83c03edb50d948828af650061066d50f Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso.evangelista@rocket.chat>
Date: Thu, 24 Oct 2024 15:08:22 -0300
Subject: [PATCH 11/22] test(ui-voip): Normalize `@rocket.chat/ui-voip` unit
 tests (#33739)

---
 packages/ui-voip/package.json                 |   2 +
 .../VoipContactId/VoipContactId.spec.tsx      |  79 +++++++------
 .../__snapshots__/VoipContactId.spec.tsx.snap |   8 +-
 .../VoipDialPad/VoipDialPad.spec.tsx          | 104 +++++++++---------
 .../components/VoipPopup/VoipPopup.spec.tsx   |  17 ++-
 .../components/VoipPopupHeader.spec.tsx       |  19 ++--
 .../VoipPopup/views/VoipDialerView.spec.tsx   |  21 ++--
 .../VoipPopup/views/VoipErrorView.spec.tsx    |  13 ++-
 .../VoipPopup/views/VoipIncomingView.spec.tsx |   7 +-
 .../VoipPopup/views/VoipOngoingView.spec.tsx  |  95 ++++++++--------
 .../VoipPopup/views/VoipOutgoingView.spec.tsx |   5 +-
 .../components/VoipTimer/VoipTimer.spec.tsx   |  48 ++++----
 .../VoipTransferModal.spec.tsx                |  14 +--
 packages/ui-voip/src/hooks/useVoipEffect.tsx  |  22 ++--
 yarn.lock                                     |  31 ++++++
 15 files changed, 258 insertions(+), 227 deletions(-)

diff --git a/packages/ui-voip/package.json b/packages/ui-voip/package.json
index 3bf8cc37151a..f1e79d3352ed 100644
--- a/packages/ui-voip/package.json
+++ b/packages/ui-voip/package.json
@@ -26,6 +26,7 @@
 	"devDependencies": {
 		"@babel/core": "~7.25.8",
 		"@faker-js/faker": "~8.0.2",
+		"@react-spectrum/test-utils": "~1.0.0-alpha.2",
 		"@rocket.chat/css-in-js": "~0.31.25",
 		"@rocket.chat/eslint-config": "workspace:^",
 		"@rocket.chat/fuselage": "^0.59.3",
@@ -49,6 +50,7 @@
 		"@types/jest": "~29.5.12",
 		"@types/jest-axe": "~3.5.9",
 		"@types/react": "~17.0.80",
+		"@types/react-dom": "~17.0.25",
 		"eslint": "~8.45.0",
 		"eslint-plugin-react": "~7.32.2",
 		"eslint-plugin-react-hooks": "~4.6.2",
diff --git a/packages/ui-voip/src/components/VoipContactId/VoipContactId.spec.tsx b/packages/ui-voip/src/components/VoipContactId/VoipContactId.spec.tsx
index 595c6897eeec..43d55c2c125f 100644
--- a/packages/ui-voip/src/components/VoipContactId/VoipContactId.spec.tsx
+++ b/packages/ui-voip/src/components/VoipContactId/VoipContactId.spec.tsx
@@ -2,6 +2,7 @@ import { faker } from '@faker-js/faker';
 import { mockAppRoot } from '@rocket.chat/mock-providers';
 import { composeStories } from '@storybook/react';
 import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import { axe } from 'jest-axe';
 
 import VoipContactId from './VoipContactId';
@@ -9,57 +10,55 @@ import * as stories from './VoipContactId.stories';
 
 const testCases = Object.values(composeStories(stories)).map((story) => [story.storyName || 'Story', story]);
 
-describe('VoipContactId', () => {
-	beforeAll(() => {
-		Object.assign(navigator, {
-			clipboard: {
-				writeText: jest.fn(),
-			},
-		});
+beforeAll(() => {
+	Object.assign(navigator, {
+		clipboard: {
+			writeText: jest.fn(),
+		},
 	});
+});
 
-	test.each(testCases)(`renders %s without crashing`, async (_storyname, Story) => {
-		const tree = render(<Story />, { wrapper: mockAppRoot().build(), legacyRoot: true });
-		expect(tree.baseElement).toMatchSnapshot();
-	});
+test.each(testCases)(`renders %s without crashing`, async (_storyname, Story) => {
+	const tree = render(<Story />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+	expect(tree.baseElement).toMatchSnapshot();
+});
 
-	test.each(testCases)('%s should have no a11y violations', async (_storyname, Story) => {
-		const { container } = render(<Story />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+test.each(testCases)('%s should have no a11y violations', async (_storyname, Story) => {
+	const { container } = render(<Story />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+
+	const results = await axe(container);
+	expect(results).toHaveNoViolations();
+});
 
-		const results = await axe(container);
-		expect(results).toHaveNoViolations();
+it('should display avatar and name when username is available', () => {
+	render(<VoipContactId name='John Doe' username='john.doe' />, {
+		wrapper: mockAppRoot().build(),
+		legacyRoot: true,
 	});
 
-	it('should display avatar and name when username is available', () => {
-		render(<VoipContactId name='John Doe' username='john.doe' />, {
-			wrapper: mockAppRoot().build(),
-			legacyRoot: true,
-		});
+	expect(screen.getByRole('img', { hidden: true })).toHaveAttribute('title', 'john.doe');
+	expect(screen.getByText('John Doe')).toBeInTheDocument();
+});
 
-		expect(screen.getByRole('img', { hidden: true })).toHaveAttribute('title', 'john.doe');
-		expect(screen.getByText('John Doe')).toBeInTheDocument();
+it('should display transferedBy information when available', () => {
+	render(<VoipContactId name='John Doe' username='john.doe' transferedBy='Jane Doe' />, {
+		wrapper: mockAppRoot().build(),
+		legacyRoot: true,
 	});
 
-	it('should display transferedBy information when available', () => {
-		render(<VoipContactId name='John Doe' username='john.doe' transferedBy='Jane Doe' />, {
-			wrapper: mockAppRoot().build(),
-			legacyRoot: true,
-		});
+	expect(screen.getByText('From: Jane Doe')).toBeInTheDocument();
+});
 
-		expect(screen.getByText('From: Jane Doe')).toBeInTheDocument();
+it('should display copy button when username isnt available', async () => {
+	const phone = faker.phone.number();
+	render(<VoipContactId name={phone} />, {
+		wrapper: mockAppRoot().build(),
+		legacyRoot: true,
 	});
 
-	it('should display copy button when username isnt available', async () => {
-		const phone = faker.phone.number();
-		render(<VoipContactId name={phone} />, {
-			wrapper: mockAppRoot().build(),
-			legacyRoot: true,
-		});
+	const copyButton = screen.getByRole('button', { name: 'Copy_phone_number' });
+	expect(copyButton).toBeInTheDocument();
 
-		const copyButton = screen.getByRole('button', { name: 'Copy_phone_number' });
-		expect(copyButton).toBeInTheDocument();
-
-		copyButton.click();
-		await waitFor(() => expect(navigator.clipboard.writeText).toHaveBeenCalledWith(phone));
-	});
+	await userEvent.click(copyButton);
+	await waitFor(() => expect(navigator.clipboard.writeText).toHaveBeenCalledWith(phone));
 });
diff --git a/packages/ui-voip/src/components/VoipContactId/__snapshots__/VoipContactId.spec.tsx.snap b/packages/ui-voip/src/components/VoipContactId/__snapshots__/VoipContactId.spec.tsx.snap
index e8d94cbfdde4..46980fbdccaf 100644
--- a/packages/ui-voip/src/components/VoipContactId/__snapshots__/VoipContactId.spec.tsx.snap
+++ b/packages/ui-voip/src/components/VoipContactId/__snapshots__/VoipContactId.spec.tsx.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`VoipContactId renders Loading without crashing 1`] = `
+exports[`renders Loading without crashing 1`] = `
 <body>
   <div>
     <div
@@ -21,7 +21,7 @@ exports[`VoipContactId renders Loading without crashing 1`] = `
 </body>
 `;
 
-exports[`VoipContactId renders WithPhoneNumber without crashing 1`] = `
+exports[`renders WithPhoneNumber without crashing 1`] = `
 <body>
   <div>
     <div
@@ -59,7 +59,7 @@ exports[`VoipContactId renders WithPhoneNumber without crashing 1`] = `
 </body>
 `;
 
-exports[`VoipContactId renders WithTransfer without crashing 1`] = `
+exports[`renders WithTransfer without crashing 1`] = `
 <body>
   <div>
     <div
@@ -106,7 +106,7 @@ exports[`VoipContactId renders WithTransfer without crashing 1`] = `
 </body>
 `;
 
-exports[`VoipContactId renders WithUsername without crashing 1`] = `
+exports[`renders WithUsername without crashing 1`] = `
 <body>
   <div>
     <div
diff --git a/packages/ui-voip/src/components/VoipDialPad/VoipDialPad.spec.tsx b/packages/ui-voip/src/components/VoipDialPad/VoipDialPad.spec.tsx
index 602c9813d948..6028a414a581 100644
--- a/packages/ui-voip/src/components/VoipDialPad/VoipDialPad.spec.tsx
+++ b/packages/ui-voip/src/components/VoipDialPad/VoipDialPad.spec.tsx
@@ -1,75 +1,79 @@
+/* eslint-disable no-await-in-loop */
+import { installPointerEvent, triggerLongPress } from '@react-spectrum/test-utils';
 import { mockAppRoot } from '@rocket.chat/mock-providers';
-import { fireEvent, render, screen } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 
 import DialPad from './VoipDialPad';
 
-describe('VoipDialPad', () => {
-	beforeEach(() => {
-		jest.useFakeTimers();
-	});
+const user = userEvent.setup({ advanceTimers: jest.advanceTimersByTime });
 
-	afterEach(() => {
-		jest.clearAllTimers();
-	});
+installPointerEvent();
 
-	it('should not be editable by default', () => {
-		render(<DialPad value='' onChange={jest.fn()} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+beforeEach(() => {
+	jest.useFakeTimers();
+});
 
-		expect(screen.getByLabelText('Phone_number')).toHaveAttribute('readOnly');
-	});
+afterEach(() => {
+	jest.clearAllTimers();
+});
 
-	it('should enable input when editable', () => {
-		render(<DialPad editable value='' onChange={jest.fn()} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+it('should not be editable by default', async () => {
+	render(<DialPad value='' onChange={jest.fn()} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
-		expect(screen.getByLabelText('Phone_number')).not.toHaveAttribute('readOnly');
-	});
+	expect(screen.getByLabelText('Phone_number')).toHaveAttribute('readOnly');
+});
 
-	it('should disable backspace button when input is empty', () => {
-		render(<DialPad editable value='' onChange={jest.fn()} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+it('should enable input when editable', async () => {
+	render(<DialPad editable value='' onChange={jest.fn()} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
-		expect(screen.getByTestId('dial-paid-input-backspace')).toBeDisabled();
-	});
+	expect(screen.getByLabelText('Phone_number')).not.toHaveAttribute('readOnly');
+});
 
-	it('should enable backspace button when input has value', () => {
-		render(<DialPad editable value='123' onChange={jest.fn()} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+it('should disable backspace button when input is empty', async () => {
+	render(<DialPad editable value='' onChange={jest.fn()} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
-		expect(screen.getByTestId('dial-paid-input-backspace')).toBeEnabled();
-	});
+	expect(screen.getByTestId('dial-paid-input-backspace')).toBeDisabled();
+});
 
-	it('should remove last character when backspace is clicked', () => {
-		const fn = jest.fn();
-		render(<DialPad editable value='123' onChange={fn} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+it('should enable backspace button when input has value', async () => {
+	render(<DialPad editable value='123' onChange={jest.fn()} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
-		expect(screen.getByLabelText('Phone_number')).toHaveValue('123');
+	expect(screen.getByTestId('dial-paid-input-backspace')).toBeEnabled();
+});
 
-		screen.getByTestId('dial-paid-input-backspace').click();
+it('should remove last character when backspace is clicked', async () => {
+	const fn = jest.fn();
+	render(<DialPad editable value='123' onChange={fn} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
-		expect(fn).toHaveBeenCalledWith('12');
-	});
+	expect(screen.getByLabelText('Phone_number')).toHaveValue('123');
 
-	it('should call onChange when number is clicked', () => {
-		const fn = jest.fn();
-		render(<DialPad editable value='123' onChange={fn} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+	await user.click(screen.getByTestId('dial-paid-input-backspace'));
+
+	expect(fn).toHaveBeenCalledWith('12');
+});
+
+it('should call onChange when number is clicked', async () => {
+	const fn = jest.fn();
+	render(<DialPad editable value='123' onChange={fn} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+
+	for (const digit of ['1', '2', '3', '4', '5', '6', '7', '8', '9', '0']) {
+		await user.click(screen.getByTestId(`dial-pad-button-${digit}`));
+		expect(fn).toHaveBeenCalledWith(`123${digit}`, digit);
+	}
+});
 
-		['1', '2', '3', '4', '5', '6', '7', '8', '9', '0'].forEach((digit) => {
-			screen.getByTestId(`dial-pad-button-${digit}`).click();
-			expect(fn).toHaveBeenCalledWith(`123${digit}`, digit);
-		});
-	});
+it('should call onChange with + when 0 pressed and held', async () => {
+	const fn = jest.fn();
+	render(<DialPad editable longPress value='123' onChange={fn} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
-	xit('should call onChange with + when 0 pressed and held', () => {
-		const fn = jest.fn();
-		render(<DialPad editable longPress value='123' onChange={fn} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+	const button = screen.getByTestId('dial-pad-button-0');
 
-		const button = screen.getByTestId('dial-pad-button-0');
+	await user.click(button);
 
-		button.click();
-		expect(fn).toHaveBeenCalledWith('1230', '0');
+	expect(fn).toHaveBeenCalledWith('1230', '0');
 
-		fireEvent.pointerDown(button);
-		jest.runOnlyPendingTimers();
-		fireEvent.pointerUp(button);
+	await triggerLongPress({ element: button, advanceTimer: (time = 800) => jest.advanceTimersByTime(time) });
 
-		expect(fn).toHaveBeenCalledWith('123+', '+');
-	});
+	expect(fn).toHaveBeenCalledWith('123+', '+');
 });
diff --git a/packages/ui-voip/src/components/VoipPopup/VoipPopup.spec.tsx b/packages/ui-voip/src/components/VoipPopup/VoipPopup.spec.tsx
index 6ebf1e6fb038..eac2e495c6d9 100644
--- a/packages/ui-voip/src/components/VoipPopup/VoipPopup.spec.tsx
+++ b/packages/ui-voip/src/components/VoipPopup/VoipPopup.spec.tsx
@@ -18,11 +18,10 @@ jest.mock('../../hooks/useVoipDialer', () => ({
 }));
 
 const mockedUseVoipSession = jest.mocked(useVoipSession);
-const appRoot = mockAppRoot();
 
 it('should properly render incoming popup', async () => {
 	mockedUseVoipSession.mockImplementationOnce(() => createMockVoipSession({ type: 'INCOMING' }));
-	render(<VoipPopup />, { wrapper: appRoot.build(), legacyRoot: true });
+	render(<VoipPopup />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
 	expect(screen.getByTestId('vc-popup-incoming')).toBeInTheDocument();
 });
@@ -30,7 +29,7 @@ it('should properly render incoming popup', async () => {
 it('should properly render ongoing popup', async () => {
 	mockedUseVoipSession.mockImplementationOnce(() => createMockVoipSession({ type: 'ONGOING' }));
 
-	render(<VoipPopup />, { wrapper: appRoot.build(), legacyRoot: true });
+	render(<VoipPopup />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
 	expect(screen.getByTestId('vc-popup-ongoing')).toBeInTheDocument();
 });
@@ -38,7 +37,7 @@ it('should properly render ongoing popup', async () => {
 it('should properly render outgoing popup', async () => {
 	mockedUseVoipSession.mockImplementationOnce(() => createMockVoipSession({ type: 'OUTGOING' }));
 
-	render(<VoipPopup />, { wrapper: appRoot.build(), legacyRoot: true });
+	render(<VoipPopup />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
 	expect(screen.getByTestId('vc-popup-outgoing')).toBeInTheDocument();
 });
@@ -46,13 +45,13 @@ it('should properly render outgoing popup', async () => {
 it('should properly render error popup', async () => {
 	mockedUseVoipSession.mockImplementationOnce(() => createMockVoipSession({ type: 'ERROR' }));
 
-	render(<VoipPopup />, { wrapper: appRoot.build(), legacyRoot: true });
+	render(<VoipPopup />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
 	expect(screen.getByTestId('vc-popup-error')).toBeInTheDocument();
 });
 
 it('should properly render dialer popup', async () => {
-	render(<VoipPopup />, { wrapper: appRoot.build(), legacyRoot: true });
+	render(<VoipPopup />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
 	expect(screen.getByTestId('vc-popup-dialer')).toBeInTheDocument();
 });
@@ -60,7 +59,7 @@ it('should properly render dialer popup', async () => {
 it('should prioritize session over dialer', async () => {
 	mockedUseVoipSession.mockImplementationOnce(() => createMockVoipSession({ type: 'INCOMING' }));
 
-	render(<VoipPopup />, { wrapper: appRoot.build(), legacyRoot: true });
+	render(<VoipPopup />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
 	expect(screen.queryByTestId('vc-popup-dialer')).not.toBeInTheDocument();
 	expect(screen.getByTestId('vc-popup-incoming')).toBeInTheDocument();
@@ -69,12 +68,12 @@ it('should prioritize session over dialer', async () => {
 const testCases = Object.values(composeStories(stories)).map((story) => [story.storyName || 'Story', story]);
 
 test.each(testCases)(`renders %s without crashing`, async (_storyname, Story) => {
-	const tree = render(<Story />, { wrapper: appRoot.build(), legacyRoot: true });
+	const tree = render(<Story />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 	expect(replaceReactAriaIds(tree.baseElement)).toMatchSnapshot();
 });
 
 test.each(testCases)('%s should have no a11y violations', async (_storyname, Story) => {
-	const { container } = render(<Story />, { wrapper: appRoot.build(), legacyRoot: true });
+	const { container } = render(<Story />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
 	const results = await axe(container);
 	expect(results).toHaveNoViolations();
diff --git a/packages/ui-voip/src/components/VoipPopup/components/VoipPopupHeader.spec.tsx b/packages/ui-voip/src/components/VoipPopup/components/VoipPopupHeader.spec.tsx
index 07e455260522..2b9bae29b5c0 100644
--- a/packages/ui-voip/src/components/VoipPopup/components/VoipPopupHeader.spec.tsx
+++ b/packages/ui-voip/src/components/VoipPopup/components/VoipPopupHeader.spec.tsx
@@ -1,44 +1,43 @@
 import { mockAppRoot } from '@rocket.chat/mock-providers';
 import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 
 import VoipPopupHeader from './VoipPopupHeader';
 
-const appRoot = mockAppRoot();
-
 it('should render title', () => {
-	render(<VoipPopupHeader>voice call header title</VoipPopupHeader>, { wrapper: appRoot.build(), legacyRoot: true });
+	render(<VoipPopupHeader>voice call header title</VoipPopupHeader>, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
 	expect(screen.getByText('voice call header title')).toBeInTheDocument();
 });
 
 it('should not render close button when onClose is not provided', () => {
-	render(<VoipPopupHeader />, { wrapper: appRoot.build(), legacyRoot: true });
+	render(<VoipPopupHeader />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
 	expect(screen.queryByRole('button', { name: 'Close' })).not.toBeInTheDocument();
 });
 
 it('should render close button when onClose is provided', () => {
-	render(<VoipPopupHeader onClose={jest.fn()} />, { wrapper: appRoot.build(), legacyRoot: true });
+	render(<VoipPopupHeader onClose={jest.fn()} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
 	expect(screen.getByRole('button', { name: 'Close' })).toBeInTheDocument();
 });
 
-it('should call onClose when close button is clicked', () => {
+it('should call onClose when close button is clicked', async () => {
 	const closeFn = jest.fn();
-	render(<VoipPopupHeader onClose={closeFn} />, { wrapper: appRoot.build(), legacyRoot: true });
+	render(<VoipPopupHeader onClose={closeFn} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
-	screen.getByRole('button', { name: 'Close' }).click();
+	await userEvent.click(screen.getByRole('button', { name: 'Close' }));
 	expect(closeFn).toHaveBeenCalled();
 });
 
 it('should render settings button by default', () => {
-	render(<VoipPopupHeader />, { wrapper: appRoot.build(), legacyRoot: true });
+	render(<VoipPopupHeader />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
 	expect(screen.getByRole('button', { name: /Device_settings/ })).toBeInTheDocument();
 });
 
 it('should not render settings button when hideSettings is true', () => {
-	render(<VoipPopupHeader hideSettings>text</VoipPopupHeader>, { wrapper: appRoot.build(), legacyRoot: true });
+	render(<VoipPopupHeader hideSettings>text</VoipPopupHeader>, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
 	expect(screen.queryByRole('button', { name: /Device_settings/ })).not.toBeInTheDocument();
 });
diff --git a/packages/ui-voip/src/components/VoipPopup/views/VoipDialerView.spec.tsx b/packages/ui-voip/src/components/VoipPopup/views/VoipDialerView.spec.tsx
index 3add6e463982..f2ef82edf36c 100644
--- a/packages/ui-voip/src/components/VoipPopup/views/VoipDialerView.spec.tsx
+++ b/packages/ui-voip/src/components/VoipPopup/views/VoipDialerView.spec.tsx
@@ -7,14 +7,12 @@ import VoipDialerView from './VoipDialerView';
 const makeCall = jest.fn();
 const closeDialer = jest.fn();
 
-const appRoot = mockAppRoot();
-
 jest.mock('../../../hooks/useVoipAPI', () => ({
 	useVoipAPI: jest.fn(() => ({ makeCall, closeDialer })),
 }));
 
 it('should look good', async () => {
-	render(<VoipDialerView />, { wrapper: appRoot.build(), legacyRoot: true });
+	render(<VoipDialerView />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
 	expect(screen.getByText('New_Call')).toBeInTheDocument();
 	expect(screen.getByRole('button', { name: /Device_settings/ })).toBeInTheDocument();
@@ -22,7 +20,7 @@ it('should look good', async () => {
 });
 
 it('should only enable call button if input has value (keyboard)', async () => {
-	render(<VoipDialerView />, { wrapper: appRoot.build(), legacyRoot: true });
+	render(<VoipDialerView />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
 	expect(screen.getByRole('button', { name: /Call/i })).toBeDisabled();
 	await userEvent.type(screen.getByLabelText('Phone_number'), '123');
@@ -30,21 +28,22 @@ it('should only enable call button if input has value (keyboard)', async () => {
 });
 
 it('should only enable call button if input has value (mouse)', async () => {
-	render(<VoipDialerView />, { wrapper: appRoot.build(), legacyRoot: true });
+	render(<VoipDialerView />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
 	expect(screen.getByRole('button', { name: /Call/i })).toBeDisabled();
-	screen.getByTestId(`dial-pad-button-1`).click();
-	screen.getByTestId(`dial-pad-button-2`).click();
-	screen.getByTestId(`dial-pad-button-3`).click();
+
+	await userEvent.click(screen.getByTestId(`dial-pad-button-1`));
+	await userEvent.click(screen.getByTestId(`dial-pad-button-2`));
+	await userEvent.click(screen.getByTestId(`dial-pad-button-3`));
 	expect(screen.getByRole('button', { name: /Call/i })).toBeEnabled();
 });
 
 it('should call methods makeCall and closeDialer when call button is clicked', async () => {
-	render(<VoipDialerView />, { wrapper: appRoot.build(), legacyRoot: true });
+	render(<VoipDialerView />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
 	await userEvent.type(screen.getByLabelText('Phone_number'), '123');
-	screen.getByTestId(`dial-pad-button-1`).click();
-	screen.getByRole('button', { name: /Call/i }).click();
+	await userEvent.click(screen.getByTestId(`dial-pad-button-1`));
+	await userEvent.click(screen.getByRole('button', { name: /Call/i }));
 	expect(makeCall).toHaveBeenCalledWith('1231');
 	expect(closeDialer).toHaveBeenCalled();
 });
diff --git a/packages/ui-voip/src/components/VoipPopup/views/VoipErrorView.spec.tsx b/packages/ui-voip/src/components/VoipPopup/views/VoipErrorView.spec.tsx
index 426b284f5102..eba09a99f895 100644
--- a/packages/ui-voip/src/components/VoipPopup/views/VoipErrorView.spec.tsx
+++ b/packages/ui-voip/src/components/VoipPopup/views/VoipErrorView.spec.tsx
@@ -1,5 +1,6 @@
 import { mockAppRoot } from '@rocket.chat/mock-providers';
 import { render, screen, within } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 
 import { createMockFreeSwitchExtensionDetails, createMockVoipErrorSession } from '../../../tests/mocks';
 import VoipErrorView from './VoipErrorView';
@@ -26,11 +27,11 @@ it('should only enable error actions', () => {
 	expect(screen.getByRole('button', { name: 'End_call' })).toBeEnabled();
 });
 
-it('should properly interact with the voice call session', () => {
+it('should properly interact with the voice call session', async () => {
 	const errorSession = createMockVoipErrorSession({ error: { status: -1, reason: '' } });
 	render(<VoipErrorView session={errorSession} />, { wrapper: appRoot.build(), legacyRoot: true });
 
-	screen.getByRole('button', { name: 'End_call' }).click();
+	await userEvent.click(screen.getByRole('button', { name: 'End_call' }));
 	expect(errorSession.end).toHaveBeenCalled();
 });
 
@@ -39,7 +40,7 @@ it('should properly render unknown error calls', async () => {
 	render(<VoipErrorView session={session} />, { wrapper: appRoot.build(), legacyRoot: true });
 
 	expect(screen.getByText('Unable_to_complete_call')).toBeInTheDocument();
-	screen.getByRole('button', { name: 'End_call' }).click();
+	await userEvent.click(screen.getByRole('button', { name: 'End_call' }));
 	expect(session.end).toHaveBeenCalled();
 });
 
@@ -49,7 +50,7 @@ it('should properly render error for unavailable calls', async () => {
 
 	expect(screen.getByText('Temporarily_unavailable')).toBeInTheDocument();
 	expect(screen.getByRole('button', { name: 'End_call' })).toBeEnabled();
-	screen.getByRole('button', { name: 'End_call' }).click();
+	await userEvent.click(screen.getByRole('button', { name: 'End_call' }));
 	expect(session.end).toHaveBeenCalled();
 });
 
@@ -59,7 +60,7 @@ it('should properly render error for busy calls', async () => {
 
 	expect(screen.getByText('Caller_is_busy')).toBeInTheDocument();
 	expect(screen.getByRole('button', { name: 'End_call' })).toBeEnabled();
-	screen.getByRole('button', { name: 'End_call' }).click();
+	await userEvent.click(screen.getByRole('button', { name: 'End_call' }));
 	expect(session.end).toHaveBeenCalled();
 });
 
@@ -69,6 +70,6 @@ it('should properly render error for terminated calls', async () => {
 
 	expect(screen.getByText('Call_terminated')).toBeInTheDocument();
 	expect(screen.getByRole('button', { name: 'End_call' })).toBeEnabled();
-	screen.getByRole('button', { name: 'End_call' }).click();
+	await userEvent.click(screen.getByRole('button', { name: 'End_call' }));
 	expect(session.end).toHaveBeenCalled();
 });
diff --git a/packages/ui-voip/src/components/VoipPopup/views/VoipIncomingView.spec.tsx b/packages/ui-voip/src/components/VoipPopup/views/VoipIncomingView.spec.tsx
index 67e1bdc131f0..88f2f79da5aa 100644
--- a/packages/ui-voip/src/components/VoipPopup/views/VoipIncomingView.spec.tsx
+++ b/packages/ui-voip/src/components/VoipPopup/views/VoipIncomingView.spec.tsx
@@ -1,5 +1,6 @@
 import { mockAppRoot } from '@rocket.chat/mock-providers';
 import { render, screen, within } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 
 import { createMockFreeSwitchExtensionDetails, createMockVoipIncomingSession } from '../../../tests/mocks';
 import VoipIncomingView from './VoipIncomingView';
@@ -27,11 +28,11 @@ it('should only enable incoming actions', () => {
 	expect(screen.getByRole('button', { name: 'Accept' })).toBeEnabled();
 });
 
-it('should properly interact with the voice call session', () => {
+it('should properly interact with the voice call session', async () => {
 	render(<VoipIncomingView session={incomingSession} />, { wrapper: appRoot.build(), legacyRoot: true });
 
-	screen.getByRole('button', { name: 'Decline' }).click();
-	screen.getByRole('button', { name: 'Accept' }).click();
+	await userEvent.click(screen.getByRole('button', { name: 'Decline' }));
+	await userEvent.click(screen.getByRole('button', { name: 'Accept' }));
 
 	expect(incomingSession.end).toHaveBeenCalled();
 	expect(incomingSession.accept).toHaveBeenCalled();
diff --git a/packages/ui-voip/src/components/VoipPopup/views/VoipOngoingView.spec.tsx b/packages/ui-voip/src/components/VoipPopup/views/VoipOngoingView.spec.tsx
index 397e369d6bbb..d1d99f5fa0c7 100644
--- a/packages/ui-voip/src/components/VoipPopup/views/VoipOngoingView.spec.tsx
+++ b/packages/ui-voip/src/components/VoipPopup/views/VoipOngoingView.spec.tsx
@@ -1,5 +1,6 @@
 import { mockAppRoot } from '@rocket.chat/mock-providers';
 import { render, screen, within } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 
 import { createMockFreeSwitchExtensionDetails, createMockVoipOngoingSession } from '../../../tests/mocks';
 import VoipOngoingView from './VoipOngoingView';
@@ -8,65 +9,65 @@ const wrapper = mockAppRoot().withEndpoint('GET', '/v1/voip-freeswitch.extension
 
 const ongoingSession = createMockVoipOngoingSession();
 
-describe('VoipOngoingView', () => {
-	beforeEach(() => {
-		jest.useFakeTimers();
-	});
+const user = userEvent.setup({ advanceTimers: jest.advanceTimersByTime });
 
-	afterEach(() => {
-		jest.clearAllTimers();
-	});
+beforeEach(() => {
+	jest.useFakeTimers();
+});
+
+afterEach(() => {
+	jest.clearAllTimers();
+});
 
-	it('should properly render ongoing view', async () => {
-		render(<VoipOngoingView session={ongoingSession} />, { wrapper: wrapper.build(), legacyRoot: true });
+it('should properly render ongoing view', async () => {
+	render(<VoipOngoingView session={ongoingSession} />, { wrapper: wrapper.build(), legacyRoot: true });
 
-		expect(screen.getByText('00:00')).toBeInTheDocument();
-		expect(screen.getByRole('button', { name: /Device_settings/ })).toBeInTheDocument();
-		expect(await screen.findByText('Administrator')).toBeInTheDocument();
-		expect(screen.queryByText('On_Hold')).not.toBeInTheDocument();
-		expect(screen.queryByText('Muted')).not.toBeInTheDocument();
-	});
+	expect(screen.getByText('00:00')).toBeInTheDocument();
+	expect(screen.getByRole('button', { name: /Device_settings/ })).toBeInTheDocument();
+	expect(await screen.findByText('Administrator')).toBeInTheDocument();
+	expect(screen.queryByText('On_Hold')).not.toBeInTheDocument();
+	expect(screen.queryByText('Muted')).not.toBeInTheDocument();
+});
 
-	it('should display on hold and muted', () => {
-		ongoingSession.isMuted = true;
-		ongoingSession.isHeld = true;
+it('should display on hold and muted', () => {
+	ongoingSession.isMuted = true;
+	ongoingSession.isHeld = true;
 
-		render(<VoipOngoingView session={ongoingSession} />, { wrapper: wrapper.build(), legacyRoot: true });
+	render(<VoipOngoingView session={ongoingSession} />, { wrapper: wrapper.build(), legacyRoot: true });
 
-		expect(screen.getByText('On_Hold')).toBeInTheDocument();
-		expect(screen.getByText('Muted')).toBeInTheDocument();
+	expect(screen.getByText('On_Hold')).toBeInTheDocument();
+	expect(screen.getByText('Muted')).toBeInTheDocument();
 
-		ongoingSession.isMuted = false;
-		ongoingSession.isHeld = false;
-	});
+	ongoingSession.isMuted = false;
+	ongoingSession.isHeld = false;
+});
 
-	it('should only enable ongoing call actions', () => {
-		render(<VoipOngoingView session={ongoingSession} />, { wrapper: wrapper.build(), legacyRoot: true });
+it('should only enable ongoing call actions', () => {
+	render(<VoipOngoingView session={ongoingSession} />, { wrapper: wrapper.build(), legacyRoot: true });
 
-		expect(within(screen.getByTestId('vc-popup-footer')).queryAllByRole('button')).toHaveLength(5);
-		expect(screen.getByRole('button', { name: 'Turn_off_microphone' })).toBeEnabled();
-		expect(screen.getByRole('button', { name: 'Hold' })).toBeEnabled();
-		expect(screen.getByRole('button', { name: 'Open_Dialpad' })).toBeEnabled();
-		expect(screen.getByRole('button', { name: 'Transfer_call' })).toBeEnabled();
-		expect(screen.getByRole('button', { name: 'End_call' })).toBeEnabled();
-	});
+	expect(within(screen.getByTestId('vc-popup-footer')).queryAllByRole('button')).toHaveLength(5);
+	expect(screen.getByRole('button', { name: 'Turn_off_microphone' })).toBeEnabled();
+	expect(screen.getByRole('button', { name: 'Hold' })).toBeEnabled();
+	expect(screen.getByRole('button', { name: 'Open_Dialpad' })).toBeEnabled();
+	expect(screen.getByRole('button', { name: 'Transfer_call' })).toBeEnabled();
+	expect(screen.getByRole('button', { name: 'End_call' })).toBeEnabled();
+});
 
-	it('should properly interact with the voice call session', () => {
-		render(<VoipOngoingView session={ongoingSession} />, { wrapper: wrapper.build(), legacyRoot: true });
+it('should properly interact with the voice call session', async () => {
+	render(<VoipOngoingView session={ongoingSession} />, { wrapper: wrapper.build(), legacyRoot: true });
 
-		screen.getByRole('button', { name: 'Turn_off_microphone' }).click();
-		expect(ongoingSession.mute).toHaveBeenCalled();
+	await user.click(screen.getByRole('button', { name: 'Turn_off_microphone' }));
+	expect(ongoingSession.mute).toHaveBeenCalled();
 
-		screen.getByRole('button', { name: 'Hold' }).click();
-		expect(ongoingSession.hold).toHaveBeenCalled();
+	await user.click(screen.getByRole('button', { name: 'Hold' }));
+	expect(ongoingSession.hold).toHaveBeenCalled();
 
-		screen.getByRole('button', { name: 'Open_Dialpad' }).click();
-		screen.getByTestId('dial-pad-button-1').click();
-		expect(screen.getByRole('textbox', { name: 'Phone_number' })).toHaveValue('1');
-		expect(ongoingSession.dtmf).toHaveBeenCalledWith('1');
+	await user.click(screen.getByRole('button', { name: 'Open_Dialpad' }));
+	await user.click(screen.getByTestId('dial-pad-button-1'));
+	expect(screen.getByRole('textbox', { name: 'Phone_number' })).toHaveValue('1');
+	expect(ongoingSession.dtmf).toHaveBeenCalledWith('1');
 
-		expect(screen.getByRole('button', { name: 'End_call' })).toBeEnabled();
-		screen.getByRole('button', { name: 'End_call' }).click();
-		expect(ongoingSession.end).toHaveBeenCalled();
-	});
+	expect(screen.getByRole('button', { name: 'End_call' })).toBeEnabled();
+	await user.click(screen.getByRole('button', { name: 'End_call' }));
+	expect(ongoingSession.end).toHaveBeenCalled();
 });
diff --git a/packages/ui-voip/src/components/VoipPopup/views/VoipOutgoingView.spec.tsx b/packages/ui-voip/src/components/VoipPopup/views/VoipOutgoingView.spec.tsx
index 2f5f3b5840f4..e733bb324c22 100644
--- a/packages/ui-voip/src/components/VoipPopup/views/VoipOutgoingView.spec.tsx
+++ b/packages/ui-voip/src/components/VoipPopup/views/VoipOutgoingView.spec.tsx
@@ -1,5 +1,6 @@
 import { mockAppRoot } from '@rocket.chat/mock-providers';
 import { render, screen, within } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 
 import { createMockFreeSwitchExtensionDetails, createMockVoipOutgoingSession } from '../../../tests/mocks';
 import VoipOutgoingView from './VoipOutgoingView';
@@ -27,9 +28,9 @@ it('should only enable outgoing actions', () => {
 	expect(screen.getByRole('button', { name: 'End_call' })).toBeEnabled();
 });
 
-it('should properly interact with the voice call session', () => {
+it('should properly interact with the voice call session', async () => {
 	render(<VoipOutgoingView session={outgoingSession} />, { wrapper: wrapper.build(), legacyRoot: true });
 
-	screen.getByRole('button', { name: 'End_call' }).click();
+	await userEvent.click(screen.getByRole('button', { name: 'End_call' }));
 	expect(outgoingSession.end).toHaveBeenCalled();
 });
diff --git a/packages/ui-voip/src/components/VoipTimer/VoipTimer.spec.tsx b/packages/ui-voip/src/components/VoipTimer/VoipTimer.spec.tsx
index 7121a0f1176e..f57338b5bb32 100644
--- a/packages/ui-voip/src/components/VoipTimer/VoipTimer.spec.tsx
+++ b/packages/ui-voip/src/components/VoipTimer/VoipTimer.spec.tsx
@@ -3,38 +3,34 @@ import { act, render, screen } from '@testing-library/react';
 
 import VoipTimer from './VoipTimer';
 
-const appRoot = mockAppRoot();
-
-describe('VoipTimer', () => {
-	beforeEach(() => {
-		jest.useFakeTimers();
-	});
+beforeEach(() => {
+	jest.useFakeTimers();
+});
 
-	afterEach(() => {
-		jest.clearAllTimers();
-	});
+afterEach(() => {
+	jest.clearAllTimers();
+});
 
-	it('should display the initial time correctly', () => {
-		render(<VoipTimer />, { wrapper: appRoot.build(), legacyRoot: true });
+it('should display the initial time correctly', () => {
+	render(<VoipTimer />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
-		expect(screen.getByText('00:00')).toBeInTheDocument();
-	});
-
-	it('should update the time after a few seconds', () => {
-		render(<VoipTimer />, { wrapper: appRoot.build(), legacyRoot: true });
+	expect(screen.getByText('00:00')).toBeInTheDocument();
+});
 
-		act(() => {
-			jest.advanceTimersByTime(5000);
-		});
+it('should update the time after a few seconds', () => {
+	render(<VoipTimer />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
-		expect(screen.getByText('00:05')).toBeInTheDocument();
+	act(() => {
+		jest.advanceTimersByTime(5000);
 	});
 
-	it('should start with a minute on the timer', () => {
-		const startTime = new Date();
-		startTime.setMinutes(startTime.getMinutes() - 1);
-		render(<VoipTimer startAt={startTime} />, { wrapper: appRoot.build(), legacyRoot: true });
+	expect(screen.getByText('00:05')).toBeInTheDocument();
+});
 
-		expect(screen.getByText('01:00')).toBeInTheDocument();
-	});
+it('should start with a minute on the timer', () => {
+	const startTime = new Date();
+	startTime.setMinutes(startTime.getMinutes() - 1);
+	render(<VoipTimer startAt={startTime} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+
+	expect(screen.getByText('01:00')).toBeInTheDocument();
 });
diff --git a/packages/ui-voip/src/components/VoipTransferModal/VoipTransferModal.spec.tsx b/packages/ui-voip/src/components/VoipTransferModal/VoipTransferModal.spec.tsx
index ddec476bcf77..f51ca43da639 100644
--- a/packages/ui-voip/src/components/VoipTransferModal/VoipTransferModal.spec.tsx
+++ b/packages/ui-voip/src/components/VoipTransferModal/VoipTransferModal.spec.tsx
@@ -2,7 +2,7 @@ import { mockAppRoot } from '@rocket.chat/mock-providers';
 import { act, render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import VoipTransferModal from '.';
+import VoipTransferModal from './VoipTransferModal';
 
 it('should be able to select transfer target', async () => {
 	const confirmFn = jest.fn();
@@ -57,19 +57,19 @@ it('should be able to select transfer target', async () => {
 
 	expect(hangUpAnTransferButton).toBeDisabled();
 
-	screen.getByLabelText('Transfer_to').focus();
 	await act(async () => {
+		await userEvent.type(screen.getByRole('textbox', { name: 'Transfer_to' }), 'Jane Doe');
 		const userOption = await screen.findByRole('option', { name: 'Jane Doe' });
 		await userEvent.click(userOption);
 	});
 
 	expect(hangUpAnTransferButton).toBeEnabled();
-	hangUpAnTransferButton.click();
+	await userEvent.click(hangUpAnTransferButton);
 
 	expect(confirmFn).toHaveBeenCalledWith({ extension: '1011', name: 'Jane Doe' });
 });
 
-it('should call onCancel when Cancel is clicked', () => {
+it('should call onCancel when Cancel is clicked', async () => {
 	const confirmFn = jest.fn();
 	const cancelFn = jest.fn();
 	render(<VoipTransferModal extension='1000' onConfirm={confirmFn} onCancel={cancelFn} />, {
@@ -77,12 +77,12 @@ it('should call onCancel when Cancel is clicked', () => {
 		legacyRoot: true,
 	});
 
-	screen.getByText('Cancel').click();
+	await userEvent.click(screen.getByRole('button', { name: 'Cancel' }));
 
 	expect(cancelFn).toHaveBeenCalled();
 });
 
-it('should call onCancel when X is clicked', () => {
+it('should call onCancel when X is clicked', async () => {
 	const confirmFn = jest.fn();
 	const cancelFn = jest.fn();
 	render(<VoipTransferModal extension='1000' onConfirm={confirmFn} onCancel={cancelFn} />, {
@@ -90,7 +90,7 @@ it('should call onCancel when X is clicked', () => {
 		legacyRoot: true,
 	});
 
-	screen.getByLabelText('Close').click();
+	await userEvent.click(screen.getByRole('button', { name: 'Close' }));
 
 	expect(cancelFn).toHaveBeenCalled();
 });
diff --git a/packages/ui-voip/src/hooks/useVoipEffect.tsx b/packages/ui-voip/src/hooks/useVoipEffect.tsx
index e412959ff923..b7c67672fc92 100644
--- a/packages/ui-voip/src/hooks/useVoipEffect.tsx
+++ b/packages/ui-voip/src/hooks/useVoipEffect.tsx
@@ -1,4 +1,4 @@
-import { useContext, useMemo, useRef } from 'react';
+import { useCallback, useContext, useRef } from 'react';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
 
 import { VoipContext } from '../contexts/VoipContext';
@@ -6,25 +6,23 @@ import type VoIPClient from '../lib/VoipClient';
 
 export const useVoipEffect = <T,>(transform: (voipClient: VoIPClient) => T, initialValue: T) => {
 	const { voipClient } = useContext(VoipContext);
-	const initValue = useRef<T>(initialValue);
+	const stateRef = useRef<T>(initialValue);
 	const transformFn = useRef(transform);
 
-	const [subscribe, getSnapshot] = useMemo(() => {
-		let state: T = initValue.current;
+	const getSnapshot = useCallback(() => stateRef.current, []);
 
-		const getSnapshot = (): T => state;
-		const subscribe = (cb: () => void) => {
+	const subscribe = useCallback(
+		(cb: () => void) => {
 			if (!voipClient) return () => undefined;
 
-			state = transformFn.current(voipClient);
+			stateRef.current = transformFn.current(voipClient);
 			return voipClient.on('stateChanged', (): void => {
-				state = transformFn.current(voipClient);
+				stateRef.current = transformFn.current(voipClient);
 				cb();
 			});
-		};
-
-		return [subscribe, getSnapshot];
-	}, [voipClient]);
+		},
+		[voipClient],
+	);
 
 	return useSyncExternalStore(subscribe, getSnapshot);
 };
diff --git a/yarn.lock b/yarn.lock
index b4ed3718e3db..d4c42cf92a83 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6705,6 +6705,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@react-aria/test-utils@npm:1.0.0-alpha.2":
+  version: 1.0.0-alpha.2
+  resolution: "@react-aria/test-utils@npm:1.0.0-alpha.2"
+  dependencies:
+    "@swc/helpers": "npm:^0.5.0"
+  peerDependencies:
+    "@testing-library/react": ^15.0.7
+    "@testing-library/user-event": ^13.0.0 || ^14.0.0
+    jest: ^29.5.0
+    react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  checksum: 10/b4f802492aced144df72c4910a815b04830cdf40817aff13b5106a9760813f6e5d80f2b3b600383900bc6cc6ccbc7fec1f1b4c622b9e618f00e9e3df328567a8
+  languageName: node
+  linkType: hard
+
 "@react-aria/textfield@npm:3.0.0-nightly.1779+afb946c4a":
   version: 3.0.0-nightly.1779
   resolution: "@react-aria/textfield@npm:3.0.0-nightly.1779"
@@ -7022,6 +7036,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@react-spectrum/test-utils@npm:~1.0.0-alpha.2":
+  version: 1.0.0-alpha.2
+  resolution: "@react-spectrum/test-utils@npm:1.0.0-alpha.2"
+  dependencies:
+    "@react-aria/test-utils": "npm:1.0.0-alpha.2"
+    "@swc/helpers": "npm:^0.5.0"
+  peerDependencies:
+    "@testing-library/react": ^15.0.7
+    "@testing-library/user-event": ^13.0.0 || ^14.0.0
+    jest: ^29.5.0
+    react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  checksum: 10/f9444cf7b4881b3c86c9142894fd6a5c4790aa5a9aab61a59da270b3b2a959f211aa5bf130e8a9baf4695d01b27a319d1f5bcabb2a14c8fe68be78eaac758fc0
+  languageName: node
+  linkType: hard
+
 "@react-spring/animated@npm:~9.7.3":
   version: 9.7.3
   resolution: "@react-spring/animated@npm:9.7.3"
@@ -10093,6 +10122,7 @@ __metadata:
   dependencies:
     "@babel/core": "npm:~7.25.8"
     "@faker-js/faker": "npm:~8.0.2"
+    "@react-spectrum/test-utils": "npm:~1.0.0-alpha.2"
     "@rocket.chat/css-in-js": "npm:~0.31.25"
     "@rocket.chat/emitter": "npm:~0.31.25"
     "@rocket.chat/eslint-config": "workspace:^"
@@ -10118,6 +10148,7 @@ __metadata:
     "@types/jest": "npm:~29.5.12"
     "@types/jest-axe": "npm:~3.5.9"
     "@types/react": "npm:~17.0.80"
+    "@types/react-dom": "npm:~17.0.25"
     eslint: "npm:~8.45.0"
     eslint-plugin-react: "npm:~7.32.2"
     eslint-plugin-react-hooks: "npm:~4.6.2"

From ad5d85ba8c365d482fde00481b00b9f35e12f909 Mon Sep 17 00:00:00 2001
From: Kevin Aleman <kaleman960@gmail.com>
Date: Thu, 24 Oct 2024 14:59:15 -0600
Subject: [PATCH 12/22] chore: Replace `cursor.count` with calls to
 `countDocuments` or `estimatedDocumentCount` (#33725)

---
 apps/meteor/app/livechat/server/lib/Helper.ts |  1 -
 .../app/livechat/server/lib/LivechatTyped.ts  | 10 ++++++-
 .../app/livechat/server/lib/QueueManager.ts   |  1 -
 .../server/lib/analytics/dashboards.ts        |  4 +--
 .../app/livechat/server/lib/departmentsLib.ts |  4 +--
 .../app/statistics/server/lib/statistics.ts   | 22 +++++++--------
 .../models/raw/LivechatDepartmentAgents.ts    | 23 ++++++++++++++++
 .../server/models/raw/LivechatVisitors.ts     |  4 +--
 apps/meteor/server/models/raw/Messages.ts     | 19 +++++++++++++
 apps/meteor/server/models/raw/Roles.ts        | 18 ++++++++++++-
 apps/meteor/server/models/raw/Rooms.ts        | 23 ++++++++++++++++
 apps/meteor/server/models/raw/Users.js        | 27 +++++++++++++++++++
 .../models/ILivechatDepartmentAgentsModel.ts  |  2 ++
 .../src/models/ILivechatVisitorsModel.ts      |  2 +-
 .../src/models/IMessagesModel.ts              |  2 ++
 .../model-typings/src/models/IRolesModel.ts   |  4 ++-
 .../model-typings/src/models/IRoomsModel.ts   |  4 +++
 .../model-typings/src/models/IUsersModel.ts   |  2 ++
 18 files changed, 149 insertions(+), 23 deletions(-)

diff --git a/apps/meteor/app/livechat/server/lib/Helper.ts b/apps/meteor/app/livechat/server/lib/Helper.ts
index a6af9cee2f24..cf11c8d12b2a 100644
--- a/apps/meteor/app/livechat/server/lib/Helper.ts
+++ b/apps/meteor/app/livechat/server/lib/Helper.ts
@@ -407,7 +407,6 @@ export const dispatchInquiryQueued = async (inquiry: ILivechatInquiryRecord, age
 		return;
 	}
 
-	logger.debug(`Notifying ${await onlineAgents.count()} agents of new inquiry`);
 	const notificationUserName = v && (v.name || v.username);
 
 	for await (const agent of onlineAgents) {
diff --git a/apps/meteor/app/livechat/server/lib/LivechatTyped.ts b/apps/meteor/app/livechat/server/lib/LivechatTyped.ts
index 9e6636d46e72..c522218f283e 100644
--- a/apps/meteor/app/livechat/server/lib/LivechatTyped.ts
+++ b/apps/meteor/app/livechat/server/lib/LivechatTyped.ts
@@ -132,7 +132,7 @@ class LivechatClass {
 			Livechat.logger.debug(`Fetching online bot agents for department ${department}`);
 			const botAgents = await Livechat.getBotAgents(department);
 			if (botAgents) {
-				const onlineBots = await botAgents.count();
+				const onlineBots = await Livechat.countBotAgents(department);
 				this.logger.debug(`Found ${onlineBots} online`);
 				if (onlineBots > 0) {
 					return true;
@@ -632,6 +632,14 @@ class LivechatClass {
 		return Users.findBotAgents();
 	}
 
+	private async countBotAgents(department?: string) {
+		if (department) {
+			return LivechatDepartmentAgents.countBotsForDepartment(department);
+		}
+
+		return Users.countBotAgents();
+	}
+
 	private async resolveChatTags(
 		room: IOmnichannelRoom,
 		options: CloseRoomParams['options'] = {},
diff --git a/apps/meteor/app/livechat/server/lib/QueueManager.ts b/apps/meteor/app/livechat/server/lib/QueueManager.ts
index 4506e38b99d4..24be8d42b7a4 100644
--- a/apps/meteor/app/livechat/server/lib/QueueManager.ts
+++ b/apps/meteor/app/livechat/server/lib/QueueManager.ts
@@ -331,7 +331,6 @@ export class QueueManager {
 			return;
 		}
 
-		logger.debug(`Notifying ${await onlineAgents.count()} agents of new inquiry`);
 		const notificationUserName = v && (v.name || v.username);
 
 		for await (const agent of onlineAgents) {
diff --git a/apps/meteor/app/livechat/server/lib/analytics/dashboards.ts b/apps/meteor/app/livechat/server/lib/analytics/dashboards.ts
index dd0d54970065..cf5a0abd5d54 100644
--- a/apps/meteor/app/livechat/server/lib/analytics/dashboards.ts
+++ b/apps/meteor/app/livechat/server/lib/analytics/dashboards.ts
@@ -247,11 +247,11 @@ const getConversationsMetricsAsync = async ({
 			language: user.language || settings.get('Language') || 'en',
 		})) || [];
 	const metrics = ['Total_conversations', 'Open_conversations', 'On_Hold_conversations', 'Total_messages'];
-	const visitorsCount = await LivechatVisitors.getVisitorsBetweenDate({
+	const visitorsCount = await LivechatVisitors.countVisitorsBetweenDate({
 		start: new Date(start),
 		end: new Date(end),
 		department: departmentId,
-	}).count();
+	});
 	return {
 		totalizers: [
 			...totalizers.filter((metric: { title: string }) => metrics.includes(metric.title)),
diff --git a/apps/meteor/app/livechat/server/lib/departmentsLib.ts b/apps/meteor/app/livechat/server/lib/departmentsLib.ts
index f149078788e3..fa66fdbfe573 100644
--- a/apps/meteor/app/livechat/server/lib/departmentsLib.ts
+++ b/apps/meteor/app/livechat/server/lib/departmentsLib.ts
@@ -296,8 +296,8 @@ export async function getRequiredDepartment(onlineRequired = true) {
 			return dept;
 		}
 
-		const onlineAgents = await LivechatDepartmentAgents.getOnlineForDepartment(dept._id);
-		if (onlineAgents && (await onlineAgents.count())) {
+		const onlineAgents = await LivechatDepartmentAgents.countOnlineForDepartment(dept._id);
+		if (onlineAgents) {
 			return dept;
 		}
 	}
diff --git a/apps/meteor/app/statistics/server/lib/statistics.ts b/apps/meteor/app/statistics/server/lib/statistics.ts
index 9defbaa42bef..9ca39d2e9d5f 100644
--- a/apps/meteor/app/statistics/server/lib/statistics.ts
+++ b/apps/meteor/app/statistics/server/lib/statistics.ts
@@ -2,7 +2,7 @@ import { log } from 'console';
 import os from 'os';
 
 import { Analytics, Team, VideoConf, Presence } from '@rocket.chat/core-services';
-import type { IRoom, IStats } from '@rocket.chat/core-typings';
+import type { IRoom, IStats, ISetting } from '@rocket.chat/core-typings';
 import { UserStatus } from '@rocket.chat/core-typings';
 import {
 	NotificationQueue,
@@ -92,7 +92,7 @@ export const statistics = {
 		};
 
 		// Version
-		const uniqueID = await Settings.findOne('uniqueID');
+		const uniqueID = await Settings.findOne<Pick<ISetting, 'createdAt'>>('uniqueID', { projection: { createdAt: 1 } });
 		statistics.uniqueId = settings.get('uniqueID');
 		if (uniqueID) {
 			statistics.installedAt = uniqueID.createdAt.toISOString();
@@ -520,7 +520,7 @@ export const statistics = {
 		);
 
 		statsPms.push(
-			NotificationQueue.col.estimatedDocumentCount().then((count) => {
+			NotificationQueue.estimatedDocumentCount().then((count) => {
 				statistics.pushQueue = count;
 			}),
 		);
@@ -546,27 +546,27 @@ export const statistics = {
 		statistics.messageAuditLoad = settings.get('Message_Auditing_Panel_Load_Count');
 		statistics.joinJitsiButton = settings.get('Jitsi_Click_To_Join_Count');
 		statistics.slashCommandsJitsi = settings.get('Jitsi_Start_SlashCommands_Count');
-		statistics.totalOTRRooms = await Rooms.findByCreatedOTR().count();
+		statistics.totalOTRRooms = await Rooms.countByCreatedOTR({ readPreference });
 		statistics.totalOTR = settings.get('OTR_Count');
-		statistics.totalBroadcastRooms = await Rooms.findByBroadcast().count();
+		statistics.totalBroadcastRooms = await Rooms.countByBroadcast({ readPreference });
 		statistics.totalTriggeredEmails = settings.get('Triggered_Emails_Count');
 		statistics.totalRoomsWithStarred = await Messages.countRoomsWithStarredMessages({ readPreference });
 		statistics.totalRoomsWithPinned = await Messages.countRoomsWithPinnedMessages({ readPreference });
 		statistics.totalUserTOTP = await Users.countActiveUsersTOTPEnable({ readPreference });
 		statistics.totalUserEmail2fa = await Users.countActiveUsersEmail2faEnable({ readPreference });
-		statistics.totalPinned = await Messages.findPinned({ readPreference }).count();
-		statistics.totalStarred = await Messages.findStarred({ readPreference }).count();
+		statistics.totalPinned = await Messages.countPinned({ readPreference });
+		statistics.totalStarred = await Messages.countStarred({ readPreference });
 		statistics.totalLinkInvitation = await Invites.estimatedDocumentCount();
 		statistics.totalLinkInvitationUses = await Invites.countUses();
 		statistics.totalEmailInvitation = settings.get('Invitation_Email_Count');
-		statistics.totalE2ERooms = await Rooms.findByE2E({ readPreference }).count();
+		statistics.totalE2ERooms = await Rooms.countByE2E({ readPreference });
 		statistics.logoChange = Object.keys(settings.get('Assets_logo') || {}).includes('url');
 		statistics.showHomeButton = settings.get('Layout_Show_Home_Button');
 		statistics.totalEncryptedMessages = await Messages.countByType('e2e', { readPreference });
 		statistics.totalManuallyAddedUsers = settings.get('Manual_Entry_User_Count');
-		statistics.totalSubscriptionRoles = await RolesRaw.findByScope('Subscriptions').count();
-		statistics.totalUserRoles = await RolesRaw.findByScope('Users').count();
-		statistics.totalCustomRoles = await RolesRaw.findCustomRoles({ readPreference }).count();
+		statistics.totalSubscriptionRoles = await RolesRaw.countByScope('Subscriptions', { readPreference });
+		statistics.totalUserRoles = await RolesRaw.countByScope('Users', { readPreference });
+		statistics.totalCustomRoles = await RolesRaw.countCustomRoles({ readPreference });
 		statistics.totalWebRTCCalls = settings.get('WebRTC_Calls_Count');
 		statistics.uncaughtExceptionsCount = settings.get('Uncaught_Exceptions_Count');
 
diff --git a/apps/meteor/server/models/raw/LivechatDepartmentAgents.ts b/apps/meteor/server/models/raw/LivechatDepartmentAgents.ts
index 891542f03e7a..6d7ec76222db 100644
--- a/apps/meteor/server/models/raw/LivechatDepartmentAgents.ts
+++ b/apps/meteor/server/models/raw/LivechatDepartmentAgents.ts
@@ -267,6 +267,19 @@ export class LivechatDepartmentAgentsRaw extends BaseRaw<ILivechatDepartmentAgen
 		return this.find(query);
 	}
 
+	async countOnlineForDepartment(departmentId: string, isLivechatEnabledWhenAgentIdle?: boolean): Promise<number> {
+		const agents = await this.findByDepartmentId(departmentId, { projection: { username: 1 } }).toArray();
+
+		if (agents.length === 0) {
+			return 0;
+		}
+
+		return Users.countOnlineUserFromList(
+			agents.map((a) => a.username),
+			isLivechatEnabledWhenAgentIdle,
+		);
+	}
+
 	async getBotsForDepartment(departmentId: string): Promise<undefined | FindCursor<ILivechatDepartmentAgents>> {
 		const agents = await this.findByDepartmentId(departmentId).toArray();
 
@@ -287,6 +300,16 @@ export class LivechatDepartmentAgentsRaw extends BaseRaw<ILivechatDepartmentAgen
 		return this.find(query);
 	}
 
+	async countBotsForDepartment(departmentId: string): Promise<number> {
+		const agents = await this.findByDepartmentId(departmentId, { projection: { username: 1 } }).toArray();
+
+		if (agents.length === 0) {
+			return 0;
+		}
+
+		return Users.countBotAgents(agents.map((a) => a.username));
+	}
+
 	async getNextBotForDepartment(
 		departmentId: ILivechatDepartmentAgents['departmentId'],
 		ignoreAgentId?: ILivechatDepartmentAgents['agentId'],
diff --git a/apps/meteor/server/models/raw/LivechatVisitors.ts b/apps/meteor/server/models/raw/LivechatVisitors.ts
index 396b728159ff..58a56909cb06 100644
--- a/apps/meteor/server/models/raw/LivechatVisitors.ts
+++ b/apps/meteor/server/models/raw/LivechatVisitors.ts
@@ -105,7 +105,7 @@ export class LivechatVisitorsRaw extends BaseRaw<ILivechatVisitor> implements IL
 		return this.findOne(query, options);
 	}
 
-	getVisitorsBetweenDate({ start, end, department }: { start: Date; end: Date; department?: string }): FindCursor<ILivechatVisitor> {
+	countVisitorsBetweenDate({ start, end, department }: { start: Date; end: Date; department?: string }): Promise<number> {
 		const query = {
 			disabled: { $ne: true },
 			_updatedAt: {
@@ -115,7 +115,7 @@ export class LivechatVisitorsRaw extends BaseRaw<ILivechatVisitor> implements IL
 			...(department && department !== 'undefined' && { department }),
 		};
 
-		return this.find(query, { projection: { _id: 1 } });
+		return this.countDocuments(query);
 	}
 
 	async getNextVisitorUsername(): Promise<string> {
diff --git a/apps/meteor/server/models/raw/Messages.ts b/apps/meteor/server/models/raw/Messages.ts
index 3f79e174fec0..84013af5b895 100644
--- a/apps/meteor/server/models/raw/Messages.ts
+++ b/apps/meteor/server/models/raw/Messages.ts
@@ -539,6 +539,16 @@ export class MessagesRaw extends BaseRaw<IMessage> implements IMessagesModel {
 		return this.find(query, options);
 	}
 
+	countPinned(options?: CountDocumentsOptions): Promise<number> {
+		const query: Filter<IMessage> = {
+			t: { $ne: 'rm' as MessageTypesValues },
+			_hidden: { $ne: true },
+			pinned: true,
+		};
+
+		return this.countDocuments(query, options);
+	}
+
 	findPaginatedPinnedByRoom(roomId: IMessage['rid'], options?: FindOptions<IMessage>): FindPaginated<FindCursor<IMessage>> {
 		const query: Filter<IMessage> = {
 			t: { $ne: 'rm' },
@@ -559,6 +569,15 @@ export class MessagesRaw extends BaseRaw<IMessage> implements IMessagesModel {
 		return this.find(query, options);
 	}
 
+	countStarred(options?: CountDocumentsOptions): Promise<number> {
+		const query: Filter<IMessage> = {
+			'_hidden': { $ne: true },
+			'starred._id': { $exists: true },
+		};
+
+		return this.countDocuments(query, options);
+	}
+
 	async setFederationReactionEventId(username: string, _id: string, reaction: string, federationEventId: string): Promise<void> {
 		await this.updateOne(
 			{ _id },
diff --git a/apps/meteor/server/models/raw/Roles.ts b/apps/meteor/server/models/raw/Roles.ts
index c3dfab7a702a..d223e8249cae 100644
--- a/apps/meteor/server/models/raw/Roles.ts
+++ b/apps/meteor/server/models/raw/Roles.ts
@@ -1,7 +1,7 @@
 import type { IRole, IRoom, IUser, RocketChatRecordDeleted } from '@rocket.chat/core-typings';
 import type { IRolesModel } from '@rocket.chat/model-typings';
 import { Subscriptions, Users } from '@rocket.chat/models';
-import type { Collection, FindCursor, Db, Filter, FindOptions, Document } from 'mongodb';
+import type { Collection, FindCursor, Db, Filter, FindOptions, Document, CountDocumentsOptions } from 'mongodb';
 
 import { notifyOnSubscriptionChangedByRoomIdAndUserId } from '../../../app/lib/server/lib/notifyListener';
 import { BaseRaw } from './BaseRaw';
@@ -184,6 +184,14 @@ export class RolesRaw extends BaseRaw<IRole> implements IRolesModel {
 		return this.find(query, options || {});
 	}
 
+	countByScope(scope: IRole['scope'], options?: CountDocumentsOptions): Promise<number> {
+		const query = {
+			scope,
+		};
+
+		return this.countDocuments(query, options);
+	}
+
 	findCustomRoles(options?: FindOptions<IRole>): FindCursor<IRole> {
 		const query: Filter<IRole> = {
 			protected: false,
@@ -192,6 +200,14 @@ export class RolesRaw extends BaseRaw<IRole> implements IRolesModel {
 		return this.find(query, options || {});
 	}
 
+	countCustomRoles(options?: CountDocumentsOptions): Promise<number> {
+		const query: Filter<IRole> = {
+			protected: false,
+		};
+
+		return this.countDocuments(query, options || {});
+	}
+
 	async updateById(
 		_id: IRole['_id'],
 		name: IRole['name'],
diff --git a/apps/meteor/server/models/raw/Rooms.ts b/apps/meteor/server/models/raw/Rooms.ts
index 0d0770994fbd..a33e161e0ad5 100644
--- a/apps/meteor/server/models/raw/Rooms.ts
+++ b/apps/meteor/server/models/raw/Rooms.ts
@@ -26,6 +26,7 @@ import type {
 	UpdateOptions,
 	UpdateResult,
 	ModifyResult,
+	CountDocumentsOptions,
 } from 'mongodb';
 
 import { readSecondaryPreferred } from '../../database/readSecondaryPreferred';
@@ -654,6 +655,15 @@ export class RoomsRaw extends BaseRaw<IRoom> implements IRoomsModel {
 		);
 	}
 
+	countByBroadcast(options?: CountDocumentsOptions): Promise<number> {
+		return this.countDocuments(
+			{
+				broadcast: true,
+			},
+			options,
+		);
+	}
+
 	setAsFederated(roomId: IRoom['_id']): Promise<UpdateResult> {
 		return this.updateOne({ _id: roomId }, { $set: { federated: true } });
 	}
@@ -695,6 +705,15 @@ export class RoomsRaw extends BaseRaw<IRoom> implements IRoomsModel {
 		);
 	}
 
+	countByE2E(options?: CountDocumentsOptions): Promise<number> {
+		return this.countDocuments(
+			{
+				encrypted: true,
+			},
+			options,
+		);
+	}
+
 	findE2ERoomById(roomId: IRoom['_id'], options: FindOptions<IRoom> = {}): Promise<IRoom | null> {
 		return this.findOne(
 			{
@@ -1485,6 +1504,10 @@ export class RoomsRaw extends BaseRaw<IRoom> implements IRoomsModel {
 		return this.find({ createdOTR: true });
 	}
 
+	countByCreatedOTR(options?: CountDocumentsOptions): Promise<number> {
+		return this.countDocuments({ createdOTR: true }, options);
+	}
+
 	findByUsernamesOrUids(uids: IRoom['u']['_id'][], usernames: IRoom['u']['username'][]): FindCursor<IRoom> {
 		return this.find({ $or: [{ usernames: { $in: usernames } }, { uids: { $in: uids } }] });
 	}
diff --git a/apps/meteor/server/models/raw/Users.js b/apps/meteor/server/models/raw/Users.js
index 3c1badc55e25..1c0c2abecf64 100644
--- a/apps/meteor/server/models/raw/Users.js
+++ b/apps/meteor/server/models/raw/Users.js
@@ -1449,6 +1449,17 @@ export class UsersRaw extends BaseRaw {
 		return this.find(query);
 	}
 
+	countOnlineUserFromList(userList, isLivechatEnabledWhenAgentIdle) {
+		// TODO: Create class Agent
+		const username = {
+			$in: [].concat(userList),
+		};
+
+		const query = queryStatusAgentOnline({ username }, isLivechatEnabledWhenAgentIdle);
+
+		return this.countDocuments(query);
+	}
+
 	findOneOnlineAgentByUserList(userList, options, isLivechatEnabledWhenAgentIdle) {
 		// TODO:: Create class Agent
 		const username = {
@@ -1480,6 +1491,22 @@ export class UsersRaw extends BaseRaw {
 		return this.find(query);
 	}
 
+	countBotAgents(usernameList) {
+		// TODO:: Create class Agent
+		const query = {
+			roles: {
+				$all: ['bot', 'livechat-agent'],
+			},
+			...(usernameList && {
+				username: {
+					$in: [].concat(usernameList),
+				},
+			}),
+		};
+
+		return this.countDocuments(query);
+	}
+
 	removeAllRoomsByUserId(_id) {
 		return this.updateOne(
 			{
diff --git a/packages/model-typings/src/models/ILivechatDepartmentAgentsModel.ts b/packages/model-typings/src/models/ILivechatDepartmentAgentsModel.ts
index f0f151fa70d4..827b266421b3 100644
--- a/packages/model-typings/src/models/ILivechatDepartmentAgentsModel.ts
+++ b/packages/model-typings/src/models/ILivechatDepartmentAgentsModel.ts
@@ -64,7 +64,9 @@ export interface ILivechatDepartmentAgentsModel extends IBaseModel<ILivechatDepa
 		departmentId: string,
 		isLivechatEnabledWhenAgentIdle?: boolean,
 	): Promise<FindCursor<ILivechatDepartmentAgents> | undefined>;
+	countOnlineForDepartment(departmentId: string, isLivechatEnabledWhenAgentIdle?: boolean): Promise<number>;
 	getBotsForDepartment(departmentId: string): Promise<undefined | FindCursor<ILivechatDepartmentAgents>>;
+	countBotsForDepartment(departmentId: string): Promise<number>;
 	getNextBotForDepartment(
 		departmentId: ILivechatDepartmentAgents['departmentId'],
 		ignoreAgentId?: ILivechatDepartmentAgents['agentId'],
diff --git a/packages/model-typings/src/models/ILivechatVisitorsModel.ts b/packages/model-typings/src/models/ILivechatVisitorsModel.ts
index 3e17fc2a5962..998d9106cdf7 100644
--- a/packages/model-typings/src/models/ILivechatVisitorsModel.ts
+++ b/packages/model-typings/src/models/ILivechatVisitorsModel.ts
@@ -16,7 +16,6 @@ import type { FindPaginated, IBaseModel } from './IBaseModel';
 export interface ILivechatVisitorsModel extends IBaseModel<ILivechatVisitor> {
 	findById(_id: string, options?: FindOptions<ILivechatVisitor>): FindCursor<ILivechatVisitor>;
 	getVisitorByToken(token: string, options?: FindOptions<ILivechatVisitor>): Promise<ILivechatVisitor | null>;
-	getVisitorsBetweenDate({ start, end, department }: { start: Date; end: Date; department?: string }): FindCursor<ILivechatVisitor>;
 	findByNameRegexWithExceptionsAndConditions<P extends Document = ILivechatVisitor>(
 		searchTerm: string,
 		exceptions: string[],
@@ -77,4 +76,5 @@ export interface ILivechatVisitorsModel extends IBaseModel<ILivechatVisitor> {
 		data: { name?: string; username?: string; email?: string; phone?: string; livechatData: { [k: string]: any } },
 	): Promise<UpdateResult | Document | boolean>;
 	setLastChatById(_id: string, lastChat: Required<ILivechatVisitor['lastChat']>): Promise<UpdateResult>;
+	countVisitorsBetweenDate({ start, end, department }: { start: Date; end: Date; department?: string }): Promise<number>;
 }
diff --git a/packages/model-typings/src/models/IMessagesModel.ts b/packages/model-typings/src/models/IMessagesModel.ts
index 986a50c8cd29..116b00fc6fee 100644
--- a/packages/model-typings/src/models/IMessagesModel.ts
+++ b/packages/model-typings/src/models/IMessagesModel.ts
@@ -291,4 +291,6 @@ export interface IMessagesModel extends IBaseModel<IMessage> {
 
 	findThreadsByRoomId(rid: string, skip: number, limit: number): FindCursor<IMessage>;
 	decreaseReplyCountById(_id: string, inc?: number): Promise<UpdateResult>;
+	countPinned(options?: CountDocumentsOptions): Promise<number>;
+	countStarred(options?: CountDocumentsOptions): Promise<number>;
 }
diff --git a/packages/model-typings/src/models/IRolesModel.ts b/packages/model-typings/src/models/IRolesModel.ts
index f039253f7bc3..84d49ef6baee 100644
--- a/packages/model-typings/src/models/IRolesModel.ts
+++ b/packages/model-typings/src/models/IRolesModel.ts
@@ -1,5 +1,5 @@
 import type { IRole, IUser, IRoom } from '@rocket.chat/core-typings';
-import type { FindCursor, FindOptions } from 'mongodb';
+import type { FindCursor, FindOptions, CountDocumentsOptions } from 'mongodb';
 
 import type { IBaseModel } from './IBaseModel';
 
@@ -62,4 +62,6 @@ export interface IRolesModel extends IBaseModel<IRole> {
 
 	canAddUserToRole(uid: IUser['_id'], roleId: IRole['_id'], scope?: IRoom['_id']): Promise<boolean>;
 	countUsersInRole(roleId: IRole['_id'], scope?: IRoom['_id']): Promise<number>;
+	countByScope(scope: IRole['scope'], options?: CountDocumentsOptions): Promise<number>;
+	countCustomRoles(options?: CountDocumentsOptions): Promise<number>;
 }
diff --git a/packages/model-typings/src/models/IRoomsModel.ts b/packages/model-typings/src/models/IRoomsModel.ts
index d1235fc58958..83932626ed6e 100644
--- a/packages/model-typings/src/models/IRoomsModel.ts
+++ b/packages/model-typings/src/models/IRoomsModel.ts
@@ -8,6 +8,7 @@ import type {
 	UpdateOptions,
 	UpdateResult,
 	ModifyResult,
+	CountDocumentsOptions,
 } from 'mongodb';
 
 import type { Updater } from '../updater';
@@ -309,4 +310,7 @@ export interface IRoomsModel extends IBaseModel<IRoom> {
 		e2eQueue?: IRoom['usersWaitingForE2EKeys'],
 	): Promise<ModifyResult<IRoom>>;
 	countGroupDMsByUids(uids: NonNullable<IRoom['uids']>): Promise<number>;
+	countByCreatedOTR(options?: CountDocumentsOptions): Promise<number>;
+	countByBroadcast(options?: CountDocumentsOptions): Promise<number>;
+	countByE2E(options?: CountDocumentsOptions): Promise<number>;
 }
diff --git a/packages/model-typings/src/models/IUsersModel.ts b/packages/model-typings/src/models/IUsersModel.ts
index 6029b4913f2d..a2863aba8fe5 100644
--- a/packages/model-typings/src/models/IUsersModel.ts
+++ b/packages/model-typings/src/models/IUsersModel.ts
@@ -224,6 +224,7 @@ export interface IUsersModel extends IBaseModel<IUser> {
 
 	countFederatedExternalUsers(): Promise<number>;
 	findOnlineUserFromList(userList: string[], isLivechatEnabledWhenAgentIdle?: boolean): FindCursor<IUser>;
+	countOnlineUserFromList(userList: string[], isLivechatEnabledWhenAgentIdle?: boolean): Promise<number>;
 	getUnavailableAgents(
 		departmentId?: string,
 		extraQuery?: Document,
@@ -244,6 +245,7 @@ export interface IUsersModel extends IBaseModel<IUser> {
 	): Promise<IUser | null>;
 
 	findBotAgents(usernameList?: string[]): FindCursor<IUser>;
+	countBotAgents(usernameList?: string[]): Promise<number>;
 	removeAllRoomsByUserId(userId: string): Promise<UpdateResult>;
 	removeRoomByUserId(userId: string, rid: string): Promise<UpdateResult>;
 	addRoomByUserId(userId: string, rid: string): Promise<UpdateResult>;

From dd03d94bbf17850bf7f7becb37816a03c02faca6 Mon Sep 17 00:00:00 2001
From: Martin Schoeler <martin.schoeler@rocket.chat>
Date: Thu, 24 Oct 2024 19:12:25 -0300
Subject: [PATCH 13/22] test: fix flaky omnichannel send (#33768)

---
 apps/meteor/tests/e2e/page-objects/fragments/home-content.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts b/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts
index 2fe12cab570c..fdef7bef7c58 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts
@@ -85,7 +85,7 @@ export class HomeContent {
 		await this.joinRoomIfNeeded();
 		await this.page.waitForSelector('[name="msg"]:not([disabled])');
 		await this.page.locator('[name="msg"]').fill(text);
-		await this.page.getByLabel('Send').click();
+		await this.page.locator('button[aria-label="Send"]').click();
 	}
 
 	async dispatchSlashCommand(text: string): Promise<void> {

From 899e0a65d078d1e413308b70f9902ea6af2e8d56 Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso.evangelista@rocket.chat>
Date: Thu, 24 Oct 2024 21:21:54 -0300
Subject: [PATCH 14/22] regression(i18n): Broken translations in Setup Wizard
 (#33777)

---
 .../views/setupWizard/SetupWizardRoute.tsx    | 18 ++++--------
 .../views/setupWizard/steps/AdminInfoStep.tsx | 24 ++++++++--------
 .../steps/CloudAccountConfirmation.tsx        | 22 ++++++++-------
 .../steps/OrganizationInfoStep.tsx            | 28 ++++++++++---------
 .../setupWizard/steps/RegisterServerStep.tsx  | 20 +++++++------
 yarn.lock                                     | 28 +++++++++----------
 6 files changed, 71 insertions(+), 69 deletions(-)

diff --git a/apps/meteor/client/views/setupWizard/SetupWizardRoute.tsx b/apps/meteor/client/views/setupWizard/SetupWizardRoute.tsx
index 91e47b4a590f..c28aea38b4fa 100644
--- a/apps/meteor/client/views/setupWizard/SetupWizardRoute.tsx
+++ b/apps/meteor/client/views/setupWizard/SetupWizardRoute.tsx
@@ -2,7 +2,6 @@ import { useBreakpoints } from '@rocket.chat/fuselage-hooks';
 import { DarkModeProvider } from '@rocket.chat/layout';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation, I18nextProvider } from 'react-i18next';
 
 import ModalRegion from '../modal/ModalRegion';
 import SetupWizardPage from './SetupWizardPage';
@@ -16,22 +15,17 @@ export const SetupWizardRoute = (): ReactElement | null => {
 	const isMobile = !breakpoints.includes('md');
 	useBodyPosition('relative', isMobile);
 
-	const { i18n } = useTranslation();
-
 	if (locked) {
 		return null;
 	}
 
 	return (
-		// FIXME: setting the defaultNS here is problematic for components/hooks expecting it to be 'core'
-		<I18nextProvider i18n={i18n} defaultNS='onboarding'>
-			<SetupWizardProvider>
-				<DarkModeProvider.default>
-					<SetupWizardPage />
-					<ModalRegion />
-				</DarkModeProvider.default>
-			</SetupWizardProvider>
-		</I18nextProvider>
+		<SetupWizardProvider>
+			<DarkModeProvider.default>
+				<SetupWizardPage />
+				<ModalRegion />
+			</DarkModeProvider.default>
+		</SetupWizardProvider>
 	);
 };
 
diff --git a/apps/meteor/client/views/setupWizard/steps/AdminInfoStep.tsx b/apps/meteor/client/views/setupWizard/steps/AdminInfoStep.tsx
index 7b8b9b6e8a2b..fc457135cfa8 100644
--- a/apps/meteor/client/views/setupWizard/steps/AdminInfoStep.tsx
+++ b/apps/meteor/client/views/setupWizard/steps/AdminInfoStep.tsx
@@ -3,7 +3,7 @@ import { escapeRegExp } from '@rocket.chat/string-helpers';
 import { useSetting } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ComponentProps } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
+import { I18nextProvider, useTranslation } from 'react-i18next';
 
 import { useSetupWizardContext } from '../contexts/SetupWizardContext';
 
@@ -13,7 +13,7 @@ const hasBlockedName = (username: string): boolean =>
 	!!usernameBlackList.length && usernameBlackList.some((restrictedUsername) => restrictedUsername.test(escapeRegExp(username).trim()));
 
 const AdminInfoStep = (): ReactElement => {
-	const { t } = useTranslation();
+	const { t, i18n } = useTranslation();
 	const regexpForUsernameValidation = useSetting('UTF8_User_Names_Validation');
 	const usernameRegExp = new RegExp(`^${regexpForUsernameValidation}$`);
 
@@ -33,15 +33,17 @@ const AdminInfoStep = (): ReactElement => {
 	};
 
 	return (
-		<AdminInfoPage
-			validatePassword={(password): boolean => password.length > 0}
-			passwordRulesHint=''
-			validateUsername={validateUsername}
-			validateEmail={validateEmail}
-			currentStep={currentStep}
-			stepCount={maxSteps}
-			onSubmit={handleSubmit}
-		/>
+		<I18nextProvider i18n={i18n} defaultNS='onboarding'>
+			<AdminInfoPage
+				validatePassword={(password): boolean => password.length > 0}
+				passwordRulesHint=''
+				validateUsername={validateUsername}
+				validateEmail={validateEmail}
+				currentStep={currentStep}
+				stepCount={maxSteps}
+				onSubmit={handleSubmit}
+			/>
+		</I18nextProvider>
 	);
 };
 
diff --git a/apps/meteor/client/views/setupWizard/steps/CloudAccountConfirmation.tsx b/apps/meteor/client/views/setupWizard/steps/CloudAccountConfirmation.tsx
index 7dfbba246a46..202868b0a478 100644
--- a/apps/meteor/client/views/setupWizard/steps/CloudAccountConfirmation.tsx
+++ b/apps/meteor/client/views/setupWizard/steps/CloudAccountConfirmation.tsx
@@ -2,7 +2,7 @@ import { AwaitingConfirmationPage } from '@rocket.chat/onboarding-ui';
 import { useToastMessageDispatch, useSettingSetValue, useEndpoint } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useEffect, useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
+import { I18nextProvider, useTranslation } from 'react-i18next';
 
 import { useSetupWizardContext } from '../contexts/SetupWizardContext';
 
@@ -20,7 +20,7 @@ const CloudAccountConfirmation = (): ReactElement => {
 	const setShowSetupWizard = useSettingSetValue('Show_Setup_Wizard');
 	const cloudConfirmationPoll = useEndpoint('GET', '/v1/cloud.confirmationPoll');
 	const dispatchToastMessage = useToastMessageDispatch();
-	const { t } = useTranslation();
+	const { t, i18n } = useTranslation();
 
 	const getConfirmation = useCallback(async () => {
 		try {
@@ -47,14 +47,16 @@ const CloudAccountConfirmation = (): ReactElement => {
 	}, [getConfirmation, registrationData.interval]);
 
 	return (
-		<AwaitingConfirmationPage
-			currentStep={currentStep}
-			stepCount={maxSteps}
-			emailAddress={registrationData.cloudEmail}
-			securityCode={registrationData.user_code}
-			onResendEmailRequest={(): Promise<void> => registerServer({ email: registrationData.cloudEmail, resend: true })}
-			onChangeEmailRequest={(): void => goToStep(3)}
-		/>
+		<I18nextProvider i18n={i18n} defaultNS='onboarding'>
+			<AwaitingConfirmationPage
+				currentStep={currentStep}
+				stepCount={maxSteps}
+				emailAddress={registrationData.cloudEmail}
+				securityCode={registrationData.user_code}
+				onResendEmailRequest={(): Promise<void> => registerServer({ email: registrationData.cloudEmail, resend: true })}
+				onChangeEmailRequest={(): void => goToStep(3)}
+			/>
+		</I18nextProvider>
 	);
 };
 
diff --git a/apps/meteor/client/views/setupWizard/steps/OrganizationInfoStep.tsx b/apps/meteor/client/views/setupWizard/steps/OrganizationInfoStep.tsx
index eb740a0afcaa..2f0c251a4c39 100644
--- a/apps/meteor/client/views/setupWizard/steps/OrganizationInfoStep.tsx
+++ b/apps/meteor/client/views/setupWizard/steps/OrganizationInfoStep.tsx
@@ -5,7 +5,7 @@ import { useRole } from '@rocket.chat/ui-contexts';
 import type { TFunction } from 'i18next';
 import type { ComponentProps, ReactElement } from 'react';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
+import { I18nextProvider, useTranslation } from 'react-i18next';
 
 import { useSetupWizardContext } from '../contexts/SetupWizardContext';
 
@@ -28,7 +28,7 @@ const getSettingOptions = (
 };
 
 const OrganizationInfoStep = (): ReactElement => {
-	const { t } = useTranslation();
+	const { t, i18n } = useTranslation();
 	const hasAdminRole = useRole('admin');
 
 	const {
@@ -61,17 +61,19 @@ const OrganizationInfoStep = (): ReactElement => {
 	};
 
 	return (
-		<OrganizationInfoPage
-			initialValues={organizationData}
-			onSubmit={handleSubmit}
-			onBackButtonClick={!hasAdminRole ? goToPreviousStep : undefined}
-			currentStep={currentStep}
-			stepCount={maxSteps}
-			organizationIndustryOptions={organizationIndustryOptions}
-			organizationSizeOptions={organizationSizeOptions}
-			countryOptions={countryOptions}
-			nextStep={skipCloudRegistration ? t('Register') : undefined}
-		/>
+		<I18nextProvider i18n={i18n} defaultNS='onboarding'>
+			<OrganizationInfoPage
+				initialValues={organizationData}
+				onSubmit={handleSubmit}
+				onBackButtonClick={!hasAdminRole ? goToPreviousStep : undefined}
+				currentStep={currentStep}
+				stepCount={maxSteps}
+				organizationIndustryOptions={organizationIndustryOptions}
+				organizationSizeOptions={organizationSizeOptions}
+				countryOptions={countryOptions}
+				nextStep={skipCloudRegistration ? t('Register') : undefined}
+			/>
+		</I18nextProvider>
 	);
 };
 
diff --git a/apps/meteor/client/views/setupWizard/steps/RegisterServerStep.tsx b/apps/meteor/client/views/setupWizard/steps/RegisterServerStep.tsx
index 85cd5b944486..d4a4eb270740 100644
--- a/apps/meteor/client/views/setupWizard/steps/RegisterServerStep.tsx
+++ b/apps/meteor/client/views/setupWizard/steps/RegisterServerStep.tsx
@@ -3,7 +3,7 @@ import { useEndpoint, useMethod } from '@rocket.chat/ui-contexts';
 import { useMutation, useQuery } from '@tanstack/react-query';
 import type { ReactElement, ComponentProps } from 'react';
 import React, { useState } from 'react';
-import { useTranslation } from 'react-i18next';
+import { I18nextProvider, useTranslation } from 'react-i18next';
 
 import { useInvalidateLicense } from '../../../hooks/useLicense';
 import { dispatchToastMessage } from '../../../lib/toast';
@@ -15,7 +15,7 @@ const SERVER_OPTIONS = {
 };
 
 const RegisterServerStep = (): ReactElement => {
-	const { t } = useTranslation();
+	const { t, i18n } = useTranslation();
 	const { currentStep, goToNextStep, setSetupWizardData, registerServer, maxSteps, completeSetupWizard, saveAgreementData } =
 		useSetupWizardContext();
 	const [serverOption, setServerOption] = useState(SERVER_OPTIONS.REGISTERED);
@@ -82,13 +82,15 @@ const RegisterServerStep = (): ReactElement => {
 	}
 
 	return (
-		<RegisterServerPage
-			onClickRegisterOffline={(): void => setServerOption(SERVER_OPTIONS.OFFLINE)}
-			stepCount={maxSteps}
-			onSubmit={handleRegister}
-			currentStep={currentStep}
-			offline={isError || (!isLoading && offline)}
-		/>
+		<I18nextProvider i18n={i18n} defaultNS='onboarding'>
+			<RegisterServerPage
+				onClickRegisterOffline={(): void => setServerOption(SERVER_OPTIONS.OFFLINE)}
+				stepCount={maxSteps}
+				onSubmit={handleRegister}
+				currentStep={currentStep}
+				offline={isError || (!isLoading && offline)}
+			/>
+		</I18nextProvider>
 	);
 };
 
diff --git a/yarn.lock b/yarn.lock
index d4c42cf92a83..0acf4401d562 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8547,10 +8547,10 @@ __metadata:
     "@rocket.chat/icons": "*"
     "@rocket.chat/prettier-config": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 8.0.0-rc.2
-    "@rocket.chat/ui-contexts": 12.0.0-rc.2
+    "@rocket.chat/ui-avatar": 8.0.0-rc.3
+    "@rocket.chat/ui-contexts": 12.0.0-rc.3
     "@rocket.chat/ui-kit": 0.37.0-rc.0
-    "@rocket.chat/ui-video-conf": 12.0.0-rc.2
+    "@rocket.chat/ui-video-conf": 12.0.0-rc.3
     "@tanstack/react-query": "*"
     react: ~17.0.2
     react-dom: "*"
@@ -8636,8 +8636,8 @@ __metadata:
     "@rocket.chat/fuselage-tokens": "*"
     "@rocket.chat/message-parser": 0.31.31
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-client": 12.0.0-rc.2
-    "@rocket.chat/ui-contexts": 12.0.0-rc.2
+    "@rocket.chat/ui-client": 12.0.0-rc.3
+    "@rocket.chat/ui-contexts": 12.0.0-rc.3
     katex: "*"
     react: "*"
   languageName: unknown
@@ -9888,7 +9888,7 @@ __metadata:
     typescript: "npm:~5.6.3"
   peerDependencies:
     "@rocket.chat/fuselage": "*"
-    "@rocket.chat/ui-contexts": 12.0.0-rc.2
+    "@rocket.chat/ui-contexts": 12.0.0-rc.3
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -9938,8 +9938,8 @@ __metadata:
     "@rocket.chat/fuselage": "*"
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
-    "@rocket.chat/ui-avatar": 8.0.0-rc.2
-    "@rocket.chat/ui-contexts": 12.0.0-rc.2
+    "@rocket.chat/ui-avatar": 8.0.0-rc.3
+    "@rocket.chat/ui-contexts": 12.0.0-rc.3
     react: "*"
     react-i18next: "*"
   languageName: unknown
@@ -10109,8 +10109,8 @@ __metadata:
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 8.0.0-rc.2
-    "@rocket.chat/ui-contexts": 12.0.0-rc.2
+    "@rocket.chat/ui-avatar": 8.0.0-rc.3
+    "@rocket.chat/ui-contexts": 12.0.0-rc.3
     react: ~17.0.2
     react-dom: ^17.0.2
   languageName: unknown
@@ -10166,9 +10166,9 @@ __metadata:
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 8.0.0-rc.2
-    "@rocket.chat/ui-client": 12.0.0-rc.2
-    "@rocket.chat/ui-contexts": 12.0.0-rc.2
+    "@rocket.chat/ui-avatar": 8.0.0-rc.3
+    "@rocket.chat/ui-client": 12.0.0-rc.3
+    "@rocket.chat/ui-contexts": 12.0.0-rc.3
     react: ~17.0.2
     react-aria: ~3.23.1
     react-dom: ^17.0.2
@@ -10255,7 +10255,7 @@ __metadata:
   peerDependencies:
     "@rocket.chat/layout": "*"
     "@rocket.chat/tools": 0.2.2
-    "@rocket.chat/ui-contexts": 12.0.0-rc.2
+    "@rocket.chat/ui-contexts": 12.0.0-rc.3
     "@tanstack/react-query": "*"
     react: "*"
     react-hook-form: "*"

From b0cc33add221cbe6a4150f713de5cd5fa81380ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=83=87=E3=83=AF=E3=83=B3=E3=82=B7=E3=83=A5?=
 <61188295+Dnouv@users.noreply.github.com>
Date: Fri, 25 Oct 2024 21:50:42 +0530
Subject: [PATCH 15/22] chore: correct capitalization of "AI Actions" (#33781)

---
 packages/i18n/src/locales/en.i18n.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index de4cfac7193f..cd3a0fd5c62f 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -401,7 +401,7 @@
   "Agent_Without_Extensions": "Agent Without Extensions",
   "Agents": "Agents",
   "Agree": "Agree",
-  "AI_Actions": "AI Actions",
+  "AI_Actions": "AI actions",
   "AirGapped_Restriction_Warning": "**Your air-gapped workspace will enter read-only mode in {{remainingDays}} days.** \n Users will still be able to access rooms and read existing messages but will be unable to send new messages. \n Reconnect it to the internet or [upgrade to a premium license](https://go.rocket.chat/i/air-gapped) to prevent this.",
   "Airgapped_workspace_warning": "This air-gapped workspace will enter read-only mode in {{remainingDays}} days. <2>Connect it to internet or upgrade to a premium plan to prevent this.</1>",
   "Airgapped_workspace_restriction": "This air-gapped workspace is in read-only mode. <2>Connect it to internet or upgraded to a premium plan to restore full functionality.</1>",

From 0cc32086f5416a2c1cd540c2f288de152793654a Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Fri, 25 Oct 2024 13:32:05 -0300
Subject: [PATCH 16/22] fix: prevent loading page on reconnect (#33770)

Co-authored-by: Diego Sampaio <chinello@gmail.com>
---
 .changeset/pretty-ladybugs-sneeze.md          |  6 +++++
 .../authentication/server/startup/index.js    | 12 +++++++++
 .../client/models/CachedCollection.ts         |  5 ++--
 apps/meteor/client/startup/startup.ts         |  8 +++---
 ee/apps/ddp-streamer/src/DDPStreamer.ts       | 27 +++++++++++++++++--
 5 files changed, 49 insertions(+), 9 deletions(-)
 create mode 100644 .changeset/pretty-ladybugs-sneeze.md

diff --git a/.changeset/pretty-ladybugs-sneeze.md b/.changeset/pretty-ladybugs-sneeze.md
new file mode 100644
index 000000000000..88aa14149dfb
--- /dev/null
+++ b/.changeset/pretty-ladybugs-sneeze.md
@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/ddp-streamer": patch
+---
+
+Fixes page loading during reconnections
diff --git a/apps/meteor/app/authentication/server/startup/index.js b/apps/meteor/app/authentication/server/startup/index.js
index 10ba3fd44154..0577ceac0ba7 100644
--- a/apps/meteor/app/authentication/server/startup/index.js
+++ b/apps/meteor/app/authentication/server/startup/index.js
@@ -23,12 +23,24 @@ import { setAvatarFromServiceWithValidation } from '../../../lib/server/function
 import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener';
 import * as Mailer from '../../../mailer/server/api';
 import { settings } from '../../../settings/server';
+import { getBaseUserFields } from '../../../utils/server/functions/getBaseUserFields';
 import { safeGetMeteorUser } from '../../../utils/server/functions/safeGetMeteorUser';
 import { isValidAttemptByUser, isValidLoginAttemptByIp } from '../lib/restrictLoginAttempts';
 
 Accounts.config({
 	forbidClientAccountCreation: true,
 });
+/**
+ * Accounts calls `_initServerPublications` and holds the `_defaultPublishFields`, without Object.assign its not possible
+ * to extend the projection
+ *
+ * the idea is to send all required fields to the client during login
+ * we tried `defaultFieldsSelector` , but it changes all Meteor.userAsync projections which is undesirable
+ *
+ *
+ * we are removing the status here because meteor send 'offline'
+ */
+Object.assign(Accounts._defaultPublishFields.projection, (({ status, ...rest }) => rest)(getBaseUserFields()));
 
 Meteor.startup(() => {
 	settings.watchMultiple(['Accounts_LoginExpiration', 'Site_Name', 'From_Email'], () => {
diff --git a/apps/meteor/app/ui-cached-collection/client/models/CachedCollection.ts b/apps/meteor/app/ui-cached-collection/client/models/CachedCollection.ts
index 602a0eddb8ce..10ea6d9453bb 100644
--- a/apps/meteor/app/ui-cached-collection/client/models/CachedCollection.ts
+++ b/apps/meteor/app/ui-cached-collection/client/models/CachedCollection.ts
@@ -83,6 +83,9 @@ export class CachedCollection<T extends { _id: string }, U = T> extends Emitter<
 		CachedCollectionManager.onLogin(() => {
 			void this.init();
 		});
+		Accounts.onLogout(() => {
+			this.ready.set(false);
+		});
 	}
 
 	protected get eventName(): `${Name}-changed` | `${string}/${Name}-changed` {
@@ -342,8 +345,6 @@ export class CachedCollection<T extends { _id: string }, U = T> extends Emitter<
 	}
 
 	async init() {
-		this.ready.set(false);
-
 		if (await this.loadFromCache()) {
 			this.trySync();
 		} else {
diff --git a/apps/meteor/client/startup/startup.ts b/apps/meteor/client/startup/startup.ts
index 8d8d8de155b8..45c102a72bf4 100644
--- a/apps/meteor/client/startup/startup.ts
+++ b/apps/meteor/client/startup/startup.ts
@@ -33,11 +33,9 @@ Meteor.startup(() => {
 			return;
 		}
 
-		// TODO: TEMPORARY UNTIL THIS IS FIXED
-		// BACKEND MS SHOULD SEND USER DATA AFTER LOGIN
-		// if (Meteor.loggingIn()) {
-		// 	return;
-		// }
+		if (Meteor.loggingIn()) {
+			return;
+		}
 
 		const user = await synchronizeUserData(uid);
 		if (!user) {
diff --git a/ee/apps/ddp-streamer/src/DDPStreamer.ts b/ee/apps/ddp-streamer/src/DDPStreamer.ts
index 275f26ae05e0..2ba89ced7138 100644
--- a/ee/apps/ddp-streamer/src/DDPStreamer.ts
+++ b/ee/apps/ddp-streamer/src/DDPStreamer.ts
@@ -2,6 +2,7 @@ import crypto from 'crypto';
 
 import { MeteorService, Presence, ServiceClass } from '@rocket.chat/core-services';
 import { InstanceStatus } from '@rocket.chat/instance-status';
+import { Users } from '@rocket.chat/models';
 import polka from 'polka';
 import { throttle } from 'underscore';
 import WebSocket from 'ws';
@@ -123,12 +124,34 @@ export class DDPStreamer extends ServiceClass {
 			}
 		});
 
-		server.on(DDP_EVENTS.LOGGED, (info) => {
+		async function sendUserData(client: Client, userId: string) {
+			// TODO figure out what fields to send. maybe to to export function getBaseUserFields to a package
+			const loggedUser = await Users.findOneById(userId, {
+				projection: { name: 1, username: 1, settings: 1, roles: 1, active: 1, statusLivechat: 1, statusDefault: 1, status: 1 },
+			});
+			if (!loggedUser) {
+				return;
+			}
+
+			// using setImmediate here so login's method result is sent before we send the user data
+			setImmediate(async () => server.added(client, 'users', userId, loggedUser));
+		}
+		server.on(DDP_EVENTS.LOGGED, async (info: Client) => {
 			const { userId, connection } = info;
 
-			Presence.newConnection(userId, connection.id, nodeID);
+			if (!userId) {
+				throw new Error('User not logged in');
+			}
+
+			await Presence.newConnection(userId, connection.id, nodeID);
+
 			this.updateConnections();
 
+			// mimic Meteor's default publication that sends user data after login
+			await sendUserData(info, userId);
+
+			server.emit('presence', { userId, connection });
+
 			this.api?.broadcast('accounts.login', { userId, connection });
 		});
 

From 5d236fa43ba2b385787673c7ee2f76013f57a953 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Fri, 25 Oct 2024 13:32:05 -0300
Subject: [PATCH 17/22] fix: prevent loading page on reconnect (#33770)

Co-authored-by: Diego Sampaio <chinello@gmail.com>
---
 .changeset/pretty-ladybugs-sneeze.md          |  6 +++++
 .../authentication/server/startup/index.js    | 12 +++++++++
 .../client/models/CachedCollection.ts         |  5 ++--
 ee/apps/ddp-streamer/src/DDPStreamer.ts       | 27 +++++++++++++++++--
 4 files changed, 46 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/pretty-ladybugs-sneeze.md

diff --git a/.changeset/pretty-ladybugs-sneeze.md b/.changeset/pretty-ladybugs-sneeze.md
new file mode 100644
index 000000000000..88aa14149dfb
--- /dev/null
+++ b/.changeset/pretty-ladybugs-sneeze.md
@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/ddp-streamer": patch
+---
+
+Fixes page loading during reconnections
diff --git a/apps/meteor/app/authentication/server/startup/index.js b/apps/meteor/app/authentication/server/startup/index.js
index 10ba3fd44154..0577ceac0ba7 100644
--- a/apps/meteor/app/authentication/server/startup/index.js
+++ b/apps/meteor/app/authentication/server/startup/index.js
@@ -23,12 +23,24 @@ import { setAvatarFromServiceWithValidation } from '../../../lib/server/function
 import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener';
 import * as Mailer from '../../../mailer/server/api';
 import { settings } from '../../../settings/server';
+import { getBaseUserFields } from '../../../utils/server/functions/getBaseUserFields';
 import { safeGetMeteorUser } from '../../../utils/server/functions/safeGetMeteorUser';
 import { isValidAttemptByUser, isValidLoginAttemptByIp } from '../lib/restrictLoginAttempts';
 
 Accounts.config({
 	forbidClientAccountCreation: true,
 });
+/**
+ * Accounts calls `_initServerPublications` and holds the `_defaultPublishFields`, without Object.assign its not possible
+ * to extend the projection
+ *
+ * the idea is to send all required fields to the client during login
+ * we tried `defaultFieldsSelector` , but it changes all Meteor.userAsync projections which is undesirable
+ *
+ *
+ * we are removing the status here because meteor send 'offline'
+ */
+Object.assign(Accounts._defaultPublishFields.projection, (({ status, ...rest }) => rest)(getBaseUserFields()));
 
 Meteor.startup(() => {
 	settings.watchMultiple(['Accounts_LoginExpiration', 'Site_Name', 'From_Email'], () => {
diff --git a/apps/meteor/app/ui-cached-collection/client/models/CachedCollection.ts b/apps/meteor/app/ui-cached-collection/client/models/CachedCollection.ts
index 602a0eddb8ce..10ea6d9453bb 100644
--- a/apps/meteor/app/ui-cached-collection/client/models/CachedCollection.ts
+++ b/apps/meteor/app/ui-cached-collection/client/models/CachedCollection.ts
@@ -83,6 +83,9 @@ export class CachedCollection<T extends { _id: string }, U = T> extends Emitter<
 		CachedCollectionManager.onLogin(() => {
 			void this.init();
 		});
+		Accounts.onLogout(() => {
+			this.ready.set(false);
+		});
 	}
 
 	protected get eventName(): `${Name}-changed` | `${string}/${Name}-changed` {
@@ -342,8 +345,6 @@ export class CachedCollection<T extends { _id: string }, U = T> extends Emitter<
 	}
 
 	async init() {
-		this.ready.set(false);
-
 		if (await this.loadFromCache()) {
 			this.trySync();
 		} else {
diff --git a/ee/apps/ddp-streamer/src/DDPStreamer.ts b/ee/apps/ddp-streamer/src/DDPStreamer.ts
index 275f26ae05e0..2ba89ced7138 100644
--- a/ee/apps/ddp-streamer/src/DDPStreamer.ts
+++ b/ee/apps/ddp-streamer/src/DDPStreamer.ts
@@ -2,6 +2,7 @@ import crypto from 'crypto';
 
 import { MeteorService, Presence, ServiceClass } from '@rocket.chat/core-services';
 import { InstanceStatus } from '@rocket.chat/instance-status';
+import { Users } from '@rocket.chat/models';
 import polka from 'polka';
 import { throttle } from 'underscore';
 import WebSocket from 'ws';
@@ -123,12 +124,34 @@ export class DDPStreamer extends ServiceClass {
 			}
 		});
 
-		server.on(DDP_EVENTS.LOGGED, (info) => {
+		async function sendUserData(client: Client, userId: string) {
+			// TODO figure out what fields to send. maybe to to export function getBaseUserFields to a package
+			const loggedUser = await Users.findOneById(userId, {
+				projection: { name: 1, username: 1, settings: 1, roles: 1, active: 1, statusLivechat: 1, statusDefault: 1, status: 1 },
+			});
+			if (!loggedUser) {
+				return;
+			}
+
+			// using setImmediate here so login's method result is sent before we send the user data
+			setImmediate(async () => server.added(client, 'users', userId, loggedUser));
+		}
+		server.on(DDP_EVENTS.LOGGED, async (info: Client) => {
 			const { userId, connection } = info;
 
-			Presence.newConnection(userId, connection.id, nodeID);
+			if (!userId) {
+				throw new Error('User not logged in');
+			}
+
+			await Presence.newConnection(userId, connection.id, nodeID);
+
 			this.updateConnections();
 
+			// mimic Meteor's default publication that sends user data after login
+			await sendUserData(info, userId);
+
+			server.emit('presence', { userId, connection });
+
 			this.api?.broadcast('accounts.login', { userId, connection });
 		});
 

From 48a787708c1b3801e82f9eeebd85075e0b001e39 Mon Sep 17 00:00:00 2001
From: Martin Schoeler <martin.schoeler@rocket.chat>
Date: Fri, 25 Oct 2024 14:52:04 -0300
Subject: [PATCH 18/22] regression: Marketplace page padding issue (#33784)

---
 .../client/views/marketplace/AppsPage/AppsPageContent.tsx   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/apps/meteor/client/views/marketplace/AppsPage/AppsPageContent.tsx b/apps/meteor/client/views/marketplace/AppsPage/AppsPageContent.tsx
index 23446b0da208..15ee5c5ba692 100644
--- a/apps/meteor/client/views/marketplace/AppsPage/AppsPageContent.tsx
+++ b/apps/meteor/client/views/marketplace/AppsPage/AppsPageContent.tsx
@@ -4,7 +4,6 @@ import type { ReactElement } from 'react';
 import React, { useEffect, useMemo, useState, useCallback } from 'react';
 
 import { usePagination } from '../../../components/GenericTable/hooks/usePagination';
-import { PageContent } from '../../../components/Page';
 import { useAppsResult } from '../../../contexts/hooks/useAppsResult';
 import { AsyncStatePhase } from '../../../lib/asyncState';
 import MarketplaceHeader from '../components/MarketplaceHeader';
@@ -224,9 +223,8 @@ const AppsPageContent = (): ReactElement => {
 	};
 
 	return (
-		<PageContent>
+		<>
 			<MarketplaceHeader unsupportedVersion={unsupportedVersion} title={t(`Apps_context_${context}`)} />
-
 			<AppsFilters
 				setText={setText}
 				freePaidFilterStructure={freePaidFilterStructure}
@@ -257,7 +255,7 @@ const AppsPageContent = (): ReactElement => {
 			)}
 			{getEmptyState()}
 			{appsResult.phase === AsyncStatePhase.REJECTED && !unsupportedVersion && <AppsPageConnectionError onButtonClick={reload} />}
-		</PageContent>
+		</>
 	);
 };
 

From e04a112ee4e48bad119af8736bad9cad53bc8d37 Mon Sep 17 00:00:00 2001
From: Martin Schoeler <martin.schoeler@rocket.chat>
Date: Fri, 25 Oct 2024 14:52:27 -0300
Subject: [PATCH 19/22] test: fix flaky `should mark target default channel as
 "favorite by default"` test (#33769)

---
 apps/meteor/tests/e2e/administration.spec.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/meteor/tests/e2e/administration.spec.ts b/apps/meteor/tests/e2e/administration.spec.ts
index 808c7e719faa..dde8bfe392d0 100644
--- a/apps/meteor/tests/e2e/administration.spec.ts
+++ b/apps/meteor/tests/e2e/administration.spec.ts
@@ -175,6 +175,7 @@ test.describe.parallel('administration', () => {
 				await poAdmin.getRoomRow(targetChannel).click();
 				await poAdmin.favoriteLabel.click();
 				await poAdmin.btnSave.click();
+				await expect(poAdmin.btnSave).not.toBeVisible();
 
 				await poAdmin.getRoomRow(targetChannel).click();
 				await expect(poAdmin.favoriteInput).toBeChecked();

From a2da34643bbba19a68537527376a1fbcbe706e7c Mon Sep 17 00:00:00 2001
From: rocketchat-github-ci <buildmaster@rocket.chat>
Date: Fri, 25 Oct 2024 18:36:56 +0000
Subject: [PATCH 20/22] Release 7.0.0-rc.4

[no ci]
---
 .changeset/bump-patch-1729881407116.md        |  5 +++
 .changeset/pre.json                           |  2 +
 apps/meteor/CHANGELOG.md                      | 37 +++++++++++++++++++
 apps/meteor/app/utils/rocketchat.info         |  2 +-
 apps/meteor/ee/server/services/CHANGELOG.md   | 14 +++++++
 apps/meteor/ee/server/services/package.json   |  2 +-
 apps/meteor/package.json                      |  2 +-
 apps/uikit-playground/CHANGELOG.md            | 12 ++++++
 apps/uikit-playground/package.json            |  2 +-
 ee/apps/account-service/CHANGELOG.md          | 14 +++++++
 ee/apps/account-service/package.json          |  2 +-
 ee/apps/authorization-service/CHANGELOG.md    | 14 +++++++
 ee/apps/authorization-service/package.json    |  2 +-
 ee/apps/ddp-streamer/CHANGELOG.md             | 17 +++++++++
 ee/apps/ddp-streamer/package.json             |  2 +-
 ee/apps/omnichannel-transcript/CHANGELOG.md   | 15 ++++++++
 ee/apps/omnichannel-transcript/package.json   |  2 +-
 ee/apps/presence-service/CHANGELOG.md         | 14 +++++++
 ee/apps/presence-service/package.json         |  2 +-
 ee/apps/queue-worker/CHANGELOG.md             | 14 +++++++
 ee/apps/queue-worker/package.json             |  2 +-
 ee/apps/stream-hub-service/CHANGELOG.md       | 13 +++++++
 ee/apps/stream-hub-service/package.json       |  2 +-
 ee/packages/license/CHANGELOG.md              |  9 +++++
 ee/packages/license/package.json              |  2 +-
 ee/packages/network-broker/CHANGELOG.md       |  9 +++++
 ee/packages/network-broker/package.json       |  2 +-
 ee/packages/omnichannel-services/CHANGELOG.md | 14 +++++++
 ee/packages/omnichannel-services/package.json |  2 +-
 ee/packages/pdf-worker/CHANGELOG.md           |  9 +++++
 ee/packages/pdf-worker/package.json           |  2 +-
 ee/packages/presence/CHANGELOG.md             | 11 ++++++
 ee/packages/presence/package.json             |  2 +-
 package.json                                  |  2 +-
 packages/api-client/CHANGELOG.md              | 10 +++++
 packages/api-client/package.json              |  2 +-
 packages/apps/CHANGELOG.md                    | 10 +++++
 packages/apps/package.json                    |  2 +-
 packages/core-services/CHANGELOG.md           | 11 ++++++
 packages/core-services/package.json           |  2 +-
 packages/core-typings/CHANGELOG.md            |  2 +
 packages/core-typings/package.json            |  2 +-
 packages/cron/CHANGELOG.md                    | 10 +++++
 packages/cron/package.json                    |  2 +-
 packages/ddp-client/CHANGELOG.md              | 11 ++++++
 packages/ddp-client/package.json              |  2 +-
 packages/freeswitch/CHANGELOG.md              |  9 +++++
 packages/freeswitch/package.json              |  2 +-
 packages/fuselage-ui-kit/CHANGELOG.md         | 13 +++++++
 packages/fuselage-ui-kit/package.json         |  8 ++--
 packages/gazzodown/CHANGELOG.md               | 11 ++++++
 packages/gazzodown/package.json               |  6 +--
 packages/instance-status/CHANGELOG.md         |  9 +++++
 packages/instance-status/package.json         |  2 +-
 packages/livechat/CHANGELOG.md                |  9 +++++
 packages/livechat/package.json                |  2 +-
 packages/model-typings/CHANGELOG.md           |  9 +++++
 packages/model-typings/package.json           |  2 +-
 packages/models/CHANGELOG.md                  |  9 +++++
 packages/models/package.json                  |  2 +-
 packages/rest-typings/CHANGELOG.md            |  9 +++++
 packages/rest-typings/package.json            |  2 +-
 packages/ui-avatar/CHANGELOG.md               |  9 +++++
 packages/ui-avatar/package.json               |  4 +-
 packages/ui-client/CHANGELOG.md               | 10 +++++
 packages/ui-client/package.json               |  6 +--
 packages/ui-contexts/CHANGELOG.md             | 11 ++++++
 packages/ui-contexts/package.json             |  2 +-
 packages/ui-video-conf/CHANGELOG.md           | 10 +++++
 packages/ui-video-conf/package.json           |  6 +--
 packages/ui-voip/CHANGELOG.md                 | 11 ++++++
 packages/ui-voip/package.json                 |  8 ++--
 packages/web-ui-registration/CHANGELOG.md     |  9 +++++
 packages/web-ui-registration/package.json     |  4 +-
 yarn.lock                                     | 28 +++++++-------
 75 files changed, 480 insertions(+), 65 deletions(-)
 create mode 100644 .changeset/bump-patch-1729881407116.md

diff --git a/.changeset/bump-patch-1729881407116.md b/.changeset/bump-patch-1729881407116.md
new file mode 100644
index 000000000000..e1eaa7980afb
--- /dev/null
+++ b/.changeset/bump-patch-1729881407116.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Bump @rocket.chat/meteor version.
diff --git a/.changeset/pre.json b/.changeset/pre.json
index f28b23fe5d37..52ec78ca1320 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -72,6 +72,7 @@
     "bump-patch-1729526930133",
     "bump-patch-1729648473274",
     "bump-patch-1729717124346",
+    "bump-patch-1729881407116",
     "chilled-boats-sip",
     "chilled-files-relate",
     "chilly-flowers-brake",
@@ -123,6 +124,7 @@
     "pink-wombats-wait",
     "plenty-hairs-camp",
     "poor-falcons-doubt",
+    "pretty-ladybugs-sneeze",
     "proud-bugs-cry",
     "purple-papayas-collect",
     "purple-tools-heal",
diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md
index bae262dff62f..cf52bda206cf 100644
--- a/apps/meteor/CHANGELOG.md
+++ b/apps/meteor/CHANGELOG.md
@@ -1,5 +1,42 @@
 # @rocket.chat/meteor
 
+## 7.0.0-rc.4
+
+### Patch Changes
+
+- Bump @rocket.chat/meteor version.
+
+- ([#33770](https://github.com/RocketChat/Rocket.Chat/pull/33770)) Fixes page loading during reconnections
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.4
+  - @rocket.chat/rest-typings@7.0.0-rc.4
+  - @rocket.chat/license@1.0.0-rc.4
+  - @rocket.chat/omnichannel-services@0.3.6-rc.4
+  - @rocket.chat/pdf-worker@0.2.6-rc.4
+  - @rocket.chat/presence@0.2.9-rc.4
+  - @rocket.chat/api-client@0.2.9-rc.4
+  - @rocket.chat/apps@0.2.0-rc.4
+  - @rocket.chat/core-services@0.7.1-rc.4
+  - @rocket.chat/cron@0.1.9-rc.4
+  - @rocket.chat/freeswitch@1.0.0-rc.4
+  - @rocket.chat/fuselage-ui-kit@12.0.0-rc.4
+  - @rocket.chat/gazzodown@12.0.0-rc.4
+  - @rocket.chat/model-typings@1.0.0-rc.4
+  - @rocket.chat/ui-contexts@12.0.0-rc.4
+  - @rocket.chat/server-cloud-communication@0.0.2
+  - @rocket.chat/network-broker@0.1.1-rc.4
+  - @rocket.chat/models@1.0.0-rc.4
+  - @rocket.chat/ui-theming@0.4.0-rc.0
+  - @rocket.chat/ui-avatar@8.0.0-rc.4
+  - @rocket.chat/ui-client@12.0.0-rc.4
+  - @rocket.chat/ui-video-conf@12.0.0-rc.4
+  - @rocket.chat/ui-voip@2.0.0-rc.4
+  - @rocket.chat/web-ui-registration@12.0.0-rc.4
+  - @rocket.chat/instance-status@0.1.9-rc.4
+  </details>
+
 ## 7.0.0-rc.3
 
 ### Patch Changes
diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info
index 1411afa507bf..2fa203ab7862 100644
--- a/apps/meteor/app/utils/rocketchat.info
+++ b/apps/meteor/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "7.0.0-rc.3"
+	"version": "7.0.0-rc.4"
 }
diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md
index 1f90a13a1af1..66bdfbb9f87b 100644
--- a/apps/meteor/ee/server/services/CHANGELOG.md
+++ b/apps/meteor/ee/server/services/CHANGELOG.md
@@ -1,5 +1,19 @@
 # rocketchat-services
 
+## 2.0.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.4
+  - @rocket.chat/rest-typings@7.0.0-rc.4
+  - @rocket.chat/core-services@0.7.1-rc.4
+  - @rocket.chat/model-typings@1.0.0-rc.4
+  - @rocket.chat/network-broker@0.1.1-rc.4
+  - @rocket.chat/models@1.0.0-rc.4
+  </details>
+
 ## 2.0.0-rc.3
 
 ### Patch Changes
diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index 39ec14932fe8..a5247ea8af66 100644
--- a/apps/meteor/ee/server/services/package.json
+++ b/apps/meteor/ee/server/services/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "rocketchat-services",
 	"private": true,
-	"version": "2.0.0-rc.3",
+	"version": "2.0.0-rc.4",
 	"description": "Rocket.Chat Authorization service",
 	"main": "index.js",
 	"scripts": {
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index e7e64332e63c..f17904b952bf 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/meteor",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "7.0.0-rc.3",
+	"version": "7.0.0-rc.4",
 	"private": true,
 	"author": {
 		"name": "Rocket.Chat",
diff --git a/apps/uikit-playground/CHANGELOG.md b/apps/uikit-playground/CHANGELOG.md
index 225633b3ed1e..485d137701c2 100644
--- a/apps/uikit-playground/CHANGELOG.md
+++ b/apps/uikit-playground/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @rocket.chat/uikit-playground
 
+## 0.6.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.4
+  - @rocket.chat/fuselage-ui-kit@12.0.0-rc.4
+  - @rocket.chat/ui-contexts@12.0.0-rc.4
+  - @rocket.chat/ui-avatar@8.0.0-rc.4
+  </details>
+
 ## 0.6.0-rc.3
 
 ### Patch Changes
diff --git a/apps/uikit-playground/package.json b/apps/uikit-playground/package.json
index aa81d232aba6..b07aff5a65a9 100644
--- a/apps/uikit-playground/package.json
+++ b/apps/uikit-playground/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rocket.chat/uikit-playground",
   "private": true,
-  "version": "0.6.0-rc.3",
+  "version": "0.6.0-rc.4",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md
index 6688e03f81c2..075e5c9c8342 100644
--- a/ee/apps/account-service/CHANGELOG.md
+++ b/ee/apps/account-service/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/account-service
 
+## 0.4.9-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.4
+  - @rocket.chat/rest-typings@7.0.0-rc.4
+  - @rocket.chat/core-services@0.7.1-rc.4
+  - @rocket.chat/model-typings@1.0.0-rc.4
+  - @rocket.chat/network-broker@0.1.1-rc.4
+  - @rocket.chat/models@1.0.0-rc.4
+  </details>
+
 ## 0.4.9-rc.3
 
 ### Patch Changes
diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json
index d16650ab8d58..8e7beed6b442 100644
--- a/ee/apps/account-service/package.json
+++ b/ee/apps/account-service/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/account-service",
 	"private": true,
-	"version": "0.4.9-rc.3",
+	"version": "0.4.9-rc.4",
 	"description": "Rocket.Chat Account service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",
diff --git a/ee/apps/authorization-service/CHANGELOG.md b/ee/apps/authorization-service/CHANGELOG.md
index 0ad246d9dc90..78ec6811c9f0 100644
--- a/ee/apps/authorization-service/CHANGELOG.md
+++ b/ee/apps/authorization-service/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/authorization-service
 
+## 0.4.9-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.4
+  - @rocket.chat/rest-typings@7.0.0-rc.4
+  - @rocket.chat/core-services@0.7.1-rc.4
+  - @rocket.chat/model-typings@1.0.0-rc.4
+  - @rocket.chat/network-broker@0.1.1-rc.4
+  - @rocket.chat/models@1.0.0-rc.4
+  </details>
+
 ## 0.4.9-rc.3
 
 ### Patch Changes
diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json
index 597d3e409bb2..db73e94a7aaf 100644
--- a/ee/apps/authorization-service/package.json
+++ b/ee/apps/authorization-service/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/authorization-service",
 	"private": true,
-	"version": "0.4.9-rc.3",
+	"version": "0.4.9-rc.4",
 	"description": "Rocket.Chat Authorization service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",
diff --git a/ee/apps/ddp-streamer/CHANGELOG.md b/ee/apps/ddp-streamer/CHANGELOG.md
index 1fd57b5ad9cd..f844825bbe62 100644
--- a/ee/apps/ddp-streamer/CHANGELOG.md
+++ b/ee/apps/ddp-streamer/CHANGELOG.md
@@ -1,5 +1,22 @@
 # @rocket.chat/ddp-streamer
 
+## 0.3.9-rc.4
+
+### Patch Changes
+
+- ([#33770](https://github.com/RocketChat/Rocket.Chat/pull/33770)) Fixes page loading during reconnections
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.4
+  - @rocket.chat/rest-typings@7.0.0-rc.4
+  - @rocket.chat/core-services@0.7.1-rc.4
+  - @rocket.chat/model-typings@1.0.0-rc.4
+  - @rocket.chat/network-broker@0.1.1-rc.4
+  - @rocket.chat/models@1.0.0-rc.4
+  - @rocket.chat/instance-status@0.1.9-rc.4
+  </details>
+
 ## 0.3.9-rc.3
 
 ### Patch Changes
diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
index 5d258120daa4..4ea26be55bad 100644
--- a/ee/apps/ddp-streamer/package.json
+++ b/ee/apps/ddp-streamer/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/ddp-streamer",
 	"private": true,
-	"version": "0.3.9-rc.3",
+	"version": "0.3.9-rc.4",
 	"description": "Rocket.Chat DDP-Streamer service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",
diff --git a/ee/apps/omnichannel-transcript/CHANGELOG.md b/ee/apps/omnichannel-transcript/CHANGELOG.md
index 3104ae81e3d2..307ad9ec1bd9 100644
--- a/ee/apps/omnichannel-transcript/CHANGELOG.md
+++ b/ee/apps/omnichannel-transcript/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @rocket.chat/omnichannel-transcript
 
+## 0.4.9-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.4
+  - @rocket.chat/omnichannel-services@0.3.6-rc.4
+  - @rocket.chat/pdf-worker@0.2.6-rc.4
+  - @rocket.chat/core-services@0.7.1-rc.4
+  - @rocket.chat/model-typings@1.0.0-rc.4
+  - @rocket.chat/network-broker@0.1.1-rc.4
+  - @rocket.chat/models@1.0.0-rc.4
+  </details>
+
 ## 0.4.9-rc.3
 
 ### Patch Changes
diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json
index 80e4b4e4df4f..8aa143debe1c 100644
--- a/ee/apps/omnichannel-transcript/package.json
+++ b/ee/apps/omnichannel-transcript/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/omnichannel-transcript",
 	"private": true,
-	"version": "0.4.9-rc.3",
+	"version": "0.4.9-rc.4",
 	"description": "Rocket.Chat service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",
diff --git a/ee/apps/presence-service/CHANGELOG.md b/ee/apps/presence-service/CHANGELOG.md
index 297aa361b91b..e688d3a523c8 100644
--- a/ee/apps/presence-service/CHANGELOG.md
+++ b/ee/apps/presence-service/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/presence-service
 
+## 0.4.9-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.4
+  - @rocket.chat/presence@0.2.9-rc.4
+  - @rocket.chat/core-services@0.7.1-rc.4
+  - @rocket.chat/model-typings@1.0.0-rc.4
+  - @rocket.chat/network-broker@0.1.1-rc.4
+  - @rocket.chat/models@1.0.0-rc.4
+  </details>
+
 ## 0.4.9-rc.3
 
 ### Patch Changes
diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json
index f9ca853ca550..314173f9aa31 100644
--- a/ee/apps/presence-service/package.json
+++ b/ee/apps/presence-service/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/presence-service",
 	"private": true,
-	"version": "0.4.9-rc.3",
+	"version": "0.4.9-rc.4",
 	"description": "Rocket.Chat Presence service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",
diff --git a/ee/apps/queue-worker/CHANGELOG.md b/ee/apps/queue-worker/CHANGELOG.md
index 39c2d5a39b3d..7c3753fa7226 100644
--- a/ee/apps/queue-worker/CHANGELOG.md
+++ b/ee/apps/queue-worker/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/queue-worker
 
+## 0.4.9-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.4
+  - @rocket.chat/omnichannel-services@0.3.6-rc.4
+  - @rocket.chat/core-services@0.7.1-rc.4
+  - @rocket.chat/model-typings@1.0.0-rc.4
+  - @rocket.chat/network-broker@0.1.1-rc.4
+  - @rocket.chat/models@1.0.0-rc.4
+  </details>
+
 ## 0.4.9-rc.3
 
 ### Patch Changes
diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json
index fdde9ae58b45..4cff9279f90c 100644
--- a/ee/apps/queue-worker/package.json
+++ b/ee/apps/queue-worker/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/queue-worker",
 	"private": true,
-	"version": "0.4.9-rc.3",
+	"version": "0.4.9-rc.4",
 	"description": "Rocket.Chat service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",
diff --git a/ee/apps/stream-hub-service/CHANGELOG.md b/ee/apps/stream-hub-service/CHANGELOG.md
index 8585e179eecd..ccc803d587a5 100644
--- a/ee/apps/stream-hub-service/CHANGELOG.md
+++ b/ee/apps/stream-hub-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/stream-hub-service
 
+## 0.4.9-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.4
+  - @rocket.chat/core-services@0.7.1-rc.4
+  - @rocket.chat/model-typings@1.0.0-rc.4
+  - @rocket.chat/network-broker@0.1.1-rc.4
+  - @rocket.chat/models@1.0.0-rc.4
+  </details>
+
 ## 0.4.9-rc.3
 
 ### Patch Changes
diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json
index 69efc6df3f5d..1463947aaab4 100644
--- a/ee/apps/stream-hub-service/package.json
+++ b/ee/apps/stream-hub-service/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/stream-hub-service",
 	"private": true,
-	"version": "0.4.9-rc.3",
+	"version": "0.4.9-rc.4",
 	"description": "Rocket.Chat Stream Hub service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",
diff --git a/ee/packages/license/CHANGELOG.md b/ee/packages/license/CHANGELOG.md
index 06bcacc17ccc..e7cc7f400795 100644
--- a/ee/packages/license/CHANGELOG.md
+++ b/ee/packages/license/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/license
 
+## 1.0.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.4
+  </details>
+
 ## 1.0.0-rc.3
 
 ### Patch Changes
diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json
index 1d9fc2733d7f..237ff7845932 100644
--- a/ee/packages/license/package.json
+++ b/ee/packages/license/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/license",
-	"version": "1.0.0-rc.3",
+	"version": "1.0.0-rc.4",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/ee/packages/network-broker/CHANGELOG.md b/ee/packages/network-broker/CHANGELOG.md
index 84a7c6ee70c4..16e0e3abc4bc 100644
--- a/ee/packages/network-broker/CHANGELOG.md
+++ b/ee/packages/network-broker/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/network-broker
 
+## 0.1.1-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-services@0.7.1-rc.4
+  </details>
+
 ## 0.1.1-rc.3
 
 ### Patch Changes
diff --git a/ee/packages/network-broker/package.json b/ee/packages/network-broker/package.json
index d1cc71733da2..dbcac077c06c 100644
--- a/ee/packages/network-broker/package.json
+++ b/ee/packages/network-broker/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/network-broker",
-	"version": "0.1.1-rc.3",
+	"version": "0.1.1-rc.4",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md
index 997a7b8401f2..9dc4dc50bcef 100644
--- a/ee/packages/omnichannel-services/CHANGELOG.md
+++ b/ee/packages/omnichannel-services/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/omnichannel-services
 
+## 0.3.6-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.4
+  - @rocket.chat/rest-typings@7.0.0-rc.4
+  - @rocket.chat/pdf-worker@0.2.6-rc.4
+  - @rocket.chat/core-services@0.7.1-rc.4
+  - @rocket.chat/model-typings@1.0.0-rc.4
+  - @rocket.chat/models@1.0.0-rc.4
+  </details>
+
 ## 0.3.6-rc.3
 
 ### Patch Changes
diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json
index 5c135d03243e..5211c42c89bc 100644
--- a/ee/packages/omnichannel-services/package.json
+++ b/ee/packages/omnichannel-services/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/omnichannel-services",
-	"version": "0.3.6-rc.3",
+	"version": "0.3.6-rc.4",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
diff --git a/ee/packages/pdf-worker/CHANGELOG.md b/ee/packages/pdf-worker/CHANGELOG.md
index 6455f81bbbf4..baf1124759bd 100644
--- a/ee/packages/pdf-worker/CHANGELOG.md
+++ b/ee/packages/pdf-worker/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/pdf-worker
 
+## 0.2.6-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.4
+  </details>
+
 ## 0.2.6-rc.3
 
 ### Patch Changes
diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json
index a5fe9ef3d217..cf2c3e460375 100644
--- a/ee/packages/pdf-worker/package.json
+++ b/ee/packages/pdf-worker/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/pdf-worker",
-	"version": "0.2.6-rc.3",
+	"version": "0.2.6-rc.4",
 	"private": true,
 	"main": "./dist/index.js",
 	"typings": "./dist/index.d.ts",
diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md
index e57b75ee05ef..7526ea5d7fc3 100644
--- a/ee/packages/presence/CHANGELOG.md
+++ b/ee/packages/presence/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/presence
 
+## 0.2.9-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.4
+  - @rocket.chat/core-services@0.7.1-rc.4
+  - @rocket.chat/models@1.0.0-rc.4
+  </details>
+
 ## 0.2.9-rc.3
 
 ### Patch Changes
diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json
index f6c909876ea6..7512c59960bf 100644
--- a/ee/packages/presence/package.json
+++ b/ee/packages/presence/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/presence",
-	"version": "0.2.9-rc.3",
+	"version": "0.2.9-rc.4",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.25.8",
diff --git a/package.json b/package.json
index 31385fc4dc0d..8563ae103554 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "rocket.chat",
-	"version": "7.0.0-rc.3",
+	"version": "7.0.0-rc.4",
 	"description": "Rocket.Chat Monorepo",
 	"main": "index.js",
 	"private": true,
diff --git a/packages/api-client/CHANGELOG.md b/packages/api-client/CHANGELOG.md
index cf72a20ae7fe..b693e8d0f4ca 100644
--- a/packages/api-client/CHANGELOG.md
+++ b/packages/api-client/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/api-client
 
+## 0.2.9-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.4
+  - @rocket.chat/rest-typings@7.0.0-rc.4
+  </details>
+
 ## 0.2.9-rc.3
 
 ### Patch Changes
diff --git a/packages/api-client/package.json b/packages/api-client/package.json
index 76d3d1f44d50..9622eb120caf 100644
--- a/packages/api-client/package.json
+++ b/packages/api-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/api-client",
-	"version": "0.2.9-rc.3",
+	"version": "0.2.9-rc.4",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/jest": "~29.5.13",
diff --git a/packages/apps/CHANGELOG.md b/packages/apps/CHANGELOG.md
index 2e6b840e2142..acf26304d1bc 100644
--- a/packages/apps/CHANGELOG.md
+++ b/packages/apps/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/apps
 
+## 0.2.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.4
+  - @rocket.chat/model-typings@1.0.0-rc.4
+  </details>
+
 ## 0.2.0-rc.3
 
 ### Patch Changes
diff --git a/packages/apps/package.json b/packages/apps/package.json
index 26db8fbe241b..01c7e0421e5c 100644
--- a/packages/apps/package.json
+++ b/packages/apps/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/apps",
-	"version": "0.2.0-rc.3",
+	"version": "0.2.0-rc.4",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md
index 4f969ddabddd..ec96b358a19e 100644
--- a/packages/core-services/CHANGELOG.md
+++ b/packages/core-services/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/core-services
 
+## 0.7.1-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.4
+  - @rocket.chat/rest-typings@7.0.0-rc.4
+  - @rocket.chat/models@1.0.0-rc.4
+  </details>
+
 ## 0.7.1-rc.3
 
 ### Patch Changes
diff --git a/packages/core-services/package.json b/packages/core-services/package.json
index 97a43a683fc6..6b234598c523 100644
--- a/packages/core-services/package.json
+++ b/packages/core-services/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/core-services",
-	"version": "0.7.1-rc.3",
+	"version": "0.7.1-rc.4",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.25.8",
diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md
index 722b482bf227..e8d588453add 100644
--- a/packages/core-typings/CHANGELOG.md
+++ b/packages/core-typings/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @rocket.chat/core-typings
 
+## 7.0.0-rc.4
+
 ## 7.0.0-rc.3
 
 ## 7.0.0-rc.2
diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json
index 250ac7cd4c2a..a8c04537c63b 100644
--- a/packages/core-typings/package.json
+++ b/packages/core-typings/package.json
@@ -2,7 +2,7 @@
 	"$schema": "https://json.schemastore.org/package",
 	"name": "@rocket.chat/core-typings",
 	"private": true,
-	"version": "7.0.0-rc.3",
+	"version": "7.0.0-rc.4",
 	"devDependencies": {
 		"@rocket.chat/apps-engine": "workspace:^",
 		"@rocket.chat/eslint-config": "workspace:^",
diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md
index 4ca2dea1a48c..f9488ab7b5b7 100644
--- a/packages/cron/CHANGELOG.md
+++ b/packages/cron/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/cron
 
+## 0.1.9-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.4
+  - @rocket.chat/models@1.0.0-rc.4
+  </details>
+
 ## 0.1.9-rc.3
 
 ### Patch Changes
diff --git a/packages/cron/package.json b/packages/cron/package.json
index 833fc0638dfa..63d5c8ebd857 100644
--- a/packages/cron/package.json
+++ b/packages/cron/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/cron",
-	"version": "0.1.9-rc.3",
+	"version": "0.1.9-rc.4",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/ddp-client/CHANGELOG.md b/packages/ddp-client/CHANGELOG.md
index d1f900a25efe..916566dff6ac 100644
--- a/packages/ddp-client/CHANGELOG.md
+++ b/packages/ddp-client/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ddp-client
 
+## 0.3.9-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.4
+  - @rocket.chat/rest-typings@7.0.0-rc.4
+  - @rocket.chat/api-client@0.2.9-rc.4
+  </details>
+
 ## 0.3.9-rc.3
 
 ### Patch Changes
diff --git a/packages/ddp-client/package.json b/packages/ddp-client/package.json
index 904fc7b1b075..633a4f098072 100644
--- a/packages/ddp-client/package.json
+++ b/packages/ddp-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ddp-client",
-	"version": "0.3.9-rc.3",
+	"version": "0.3.9-rc.4",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/jest": "~29.5.13",
diff --git a/packages/freeswitch/CHANGELOG.md b/packages/freeswitch/CHANGELOG.md
index ed60ac56c645..98c229b7c685 100644
--- a/packages/freeswitch/CHANGELOG.md
+++ b/packages/freeswitch/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/freeswitch
 
+## 1.0.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.4
+  </details>
+
 ## 1.0.0-rc.3
 
 ### Patch Changes
diff --git a/packages/freeswitch/package.json b/packages/freeswitch/package.json
index f4362426a0f6..311b518c12d0 100644
--- a/packages/freeswitch/package.json
+++ b/packages/freeswitch/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/freeswitch",
-	"version": "1.0.0-rc.3",
+	"version": "1.0.0-rc.4",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md
index 078efc4715c3..5142c4c084fc 100644
--- a/packages/fuselage-ui-kit/CHANGELOG.md
+++ b/packages/fuselage-ui-kit/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Change Log
 
+## 12.0.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.4
+  - @rocket.chat/gazzodown@12.0.0-rc.4
+  - @rocket.chat/ui-contexts@12.0.0-rc.4
+  - @rocket.chat/ui-avatar@8.0.0-rc.4
+  - @rocket.chat/ui-video-conf@12.0.0-rc.4
+  </details>
+
 ## 12.0.0-rc.3
 
 ### Patch Changes
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index 56fa8c324666..783ba8ac01ec 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/fuselage-ui-kit",
-	"version": "12.0.0-rc.3",
+	"version": "12.0.0-rc.4",
 	"private": true,
 	"description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system",
 	"homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/",
@@ -101,10 +101,10 @@
 		"@rocket.chat/icons": "*",
 		"@rocket.chat/prettier-config": "*",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-avatar": "8.0.0-rc.3",
-		"@rocket.chat/ui-contexts": "12.0.0-rc.3",
+		"@rocket.chat/ui-avatar": "8.0.0-rc.4",
+		"@rocket.chat/ui-contexts": "12.0.0-rc.4",
 		"@rocket.chat/ui-kit": "0.37.0-rc.0",
-		"@rocket.chat/ui-video-conf": "12.0.0-rc.3",
+		"@rocket.chat/ui-video-conf": "12.0.0-rc.4",
 		"@tanstack/react-query": "*",
 		"react": "~17.0.2",
 		"react-dom": "*"
diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md
index 58f2357ec2de..b49400290cc3 100644
--- a/packages/gazzodown/CHANGELOG.md
+++ b/packages/gazzodown/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/gazzodown
 
+## 12.0.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.4
+  - @rocket.chat/ui-contexts@12.0.0-rc.4
+  - @rocket.chat/ui-client@12.0.0-rc.4
+  </details>
+
 ## 12.0.0-rc.3
 
 ### Patch Changes
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index 3207e71b022c..dd066cd6e1f1 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/gazzodown",
-	"version": "12.0.0-rc.3",
+	"version": "12.0.0-rc.4",
 	"private": true,
 	"main": "./dist/index.js",
 	"typings": "./dist/index.d.ts",
@@ -75,8 +75,8 @@
 		"@rocket.chat/fuselage-tokens": "*",
 		"@rocket.chat/message-parser": "0.31.31",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-client": "12.0.0-rc.3",
-		"@rocket.chat/ui-contexts": "12.0.0-rc.3",
+		"@rocket.chat/ui-client": "12.0.0-rc.4",
+		"@rocket.chat/ui-contexts": "12.0.0-rc.4",
 		"katex": "*",
 		"react": "*"
 	},
diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md
index 1dfec3d3d92f..f6809432778c 100644
--- a/packages/instance-status/CHANGELOG.md
+++ b/packages/instance-status/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/instance-status
 
+## 0.1.9-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/models@1.0.0-rc.4
+  </details>
+
 ## 0.1.9-rc.3
 
 ### Patch Changes
diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json
index 05a5d3899e9a..4bf9264920f1 100644
--- a/packages/instance-status/package.json
+++ b/packages/instance-status/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/instance-status",
-	"version": "0.1.9-rc.3",
+	"version": "0.1.9-rc.4",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md
index c87095501486..9e30177b7f92 100644
--- a/packages/livechat/CHANGELOG.md
+++ b/packages/livechat/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/livechat Change Log
 
+## 1.20.1-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/gazzodown@12.0.0-rc.4
+  </details>
+
 ## 1.20.1-rc.3
 
 ### Patch Changes
diff --git a/packages/livechat/package.json b/packages/livechat/package.json
index dab0fe2c0a90..a770e90215dc 100644
--- a/packages/livechat/package.json
+++ b/packages/livechat/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/livechat",
-	"version": "1.20.1-rc.3",
+	"version": "1.20.1-rc.4",
 	"files": [
 		"/build"
 	],
diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md
index 29bba8c7605c..7adf611f668c 100644
--- a/packages/model-typings/CHANGELOG.md
+++ b/packages/model-typings/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/model-typings
 
+## 1.0.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.4
+  </details>
+
 ## 1.0.0-rc.3
 
 ### Patch Changes
diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json
index 5d81916a6bb1..ffa48b36ef61 100644
--- a/packages/model-typings/package.json
+++ b/packages/model-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/model-typings",
-	"version": "1.0.0-rc.3",
+	"version": "1.0.0-rc.4",
 	"private": true,
 	"devDependencies": {
 		"@types/node-rsa": "^1.1.4",
diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md
index 9778f5366e8e..b45c306b8257 100644
--- a/packages/models/CHANGELOG.md
+++ b/packages/models/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/models
 
+## 1.0.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/model-typings@1.0.0-rc.4
+  </details>
+
 ## 1.0.0-rc.3
 
 ### Patch Changes
diff --git a/packages/models/package.json b/packages/models/package.json
index 58c96184b345..72c6e66812a7 100644
--- a/packages/models/package.json
+++ b/packages/models/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/models",
-	"version": "1.0.0-rc.3",
+	"version": "1.0.0-rc.4",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md
index 9c320da06e8b..f5dc0779f717 100644
--- a/packages/rest-typings/CHANGELOG.md
+++ b/packages/rest-typings/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/rest-typings
 
+## 7.0.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.4
+  </details>
+
 ## 7.0.0-rc.3
 
 ### Patch Changes
diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json
index 624c7c254c53..04cdd2cec40d 100644
--- a/packages/rest-typings/package.json
+++ b/packages/rest-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/rest-typings",
-	"version": "7.0.0-rc.3",
+	"version": "7.0.0-rc.4",
 	"devDependencies": {
 		"@rocket.chat/apps-engine": "workspace:^",
 		"@rocket.chat/eslint-config": "workspace:~",
diff --git a/packages/ui-avatar/CHANGELOG.md b/packages/ui-avatar/CHANGELOG.md
index a8931e77564f..06e561a5f0bb 100644
--- a/packages/ui-avatar/CHANGELOG.md
+++ b/packages/ui-avatar/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/ui-avatar
 
+## 8.0.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@12.0.0-rc.4
+  </details>
+
 ## 8.0.0-rc.3
 
 ### Patch Changes
diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json
index 188b5cba0e47..b784c2c4b12c 100644
--- a/packages/ui-avatar/package.json
+++ b/packages/ui-avatar/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-avatar",
-	"version": "8.0.0-rc.3",
+	"version": "8.0.0-rc.4",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.25.8",
@@ -30,7 +30,7 @@
 	],
 	"peerDependencies": {
 		"@rocket.chat/fuselage": "*",
-		"@rocket.chat/ui-contexts": "12.0.0-rc.3",
+		"@rocket.chat/ui-contexts": "12.0.0-rc.4",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md
index cee0baffbac0..44a3188c58aa 100644
--- a/packages/ui-client/CHANGELOG.md
+++ b/packages/ui-client/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/ui-client
 
+## 12.0.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@12.0.0-rc.4
+  - @rocket.chat/ui-avatar@8.0.0-rc.4
+  </details>
+
 ## 12.0.0-rc.3
 
 ### Patch Changes
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index 94684b465d05..826f7a779a65 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-client",
-	"version": "12.0.0-rc.3",
+	"version": "12.0.0-rc.4",
 	"private": true,
 	"main": "./dist/index.js",
 	"typings": "./dist/index.d.ts",
@@ -60,8 +60,8 @@
 		"@rocket.chat/fuselage": "*",
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
-		"@rocket.chat/ui-avatar": "8.0.0-rc.3",
-		"@rocket.chat/ui-contexts": "12.0.0-rc.3",
+		"@rocket.chat/ui-avatar": "8.0.0-rc.4",
+		"@rocket.chat/ui-contexts": "12.0.0-rc.4",
 		"react": "*",
 		"react-i18next": "*"
 	},
diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md
index 674ccf92fa78..118e60069fcf 100644
--- a/packages/ui-contexts/CHANGELOG.md
+++ b/packages/ui-contexts/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ui-contexts
 
+## 12.0.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.0.0-rc.4
+  - @rocket.chat/rest-typings@7.0.0-rc.4
+  - @rocket.chat/ddp-client@0.3.9-rc.4
+  </details>
+
 ## 12.0.0-rc.3
 
 ### Patch Changes
diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json
index 82d74e0e221e..ab1a785f1a6e 100644
--- a/packages/ui-contexts/package.json
+++ b/packages/ui-contexts/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-contexts",
-	"version": "12.0.0-rc.3",
+	"version": "12.0.0-rc.4",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/core-typings": "workspace:^",
diff --git a/packages/ui-video-conf/CHANGELOG.md b/packages/ui-video-conf/CHANGELOG.md
index 78fb1ed355db..dab028c2ec93 100644
--- a/packages/ui-video-conf/CHANGELOG.md
+++ b/packages/ui-video-conf/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/ui-video-conf
 
+## 12.0.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@12.0.0-rc.4
+  - @rocket.chat/ui-avatar@8.0.0-rc.4
+  </details>
+
 ## 12.0.0-rc.3
 
 ### Patch Changes
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index 9b063ed2dd20..a486d329375a 100644
--- a/packages/ui-video-conf/package.json
+++ b/packages/ui-video-conf/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-video-conf",
-	"version": "12.0.0-rc.3",
+	"version": "12.0.0-rc.4",
 	"private": true,
 	"main": "./dist/index.js",
 	"typings": "./dist/index.d.ts",
@@ -58,8 +58,8 @@
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-avatar": "8.0.0-rc.3",
-		"@rocket.chat/ui-contexts": "12.0.0-rc.3",
+		"@rocket.chat/ui-avatar": "8.0.0-rc.4",
+		"@rocket.chat/ui-contexts": "12.0.0-rc.4",
 		"react": "~17.0.2",
 		"react-dom": "^17.0.2"
 	},
diff --git a/packages/ui-voip/CHANGELOG.md b/packages/ui-voip/CHANGELOG.md
index 08dcddb94073..98e79002541e 100644
--- a/packages/ui-voip/CHANGELOG.md
+++ b/packages/ui-voip/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ui-voip
 
+## 2.0.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@12.0.0-rc.4
+  - @rocket.chat/ui-avatar@8.0.0-rc.4
+  - @rocket.chat/ui-client@12.0.0-rc.4
+  </details>
+
 ## 2.0.0-rc.3
 
 ### Patch Changes
diff --git a/packages/ui-voip/package.json b/packages/ui-voip/package.json
index a6b46d6e436c..4609558de740 100644
--- a/packages/ui-voip/package.json
+++ b/packages/ui-voip/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-voip",
-	"version": "2.0.0-rc.3",
+	"version": "2.0.0-rc.4",
 	"private": true,
 	"main": "./dist/index.js",
 	"typings": "./dist/index.d.ts",
@@ -65,9 +65,9 @@
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-avatar": "8.0.0-rc.3",
-		"@rocket.chat/ui-client": "12.0.0-rc.3",
-		"@rocket.chat/ui-contexts": "12.0.0-rc.3",
+		"@rocket.chat/ui-avatar": "8.0.0-rc.4",
+		"@rocket.chat/ui-client": "12.0.0-rc.4",
+		"@rocket.chat/ui-contexts": "12.0.0-rc.4",
 		"react": "~17.0.2",
 		"react-aria": "~3.23.1",
 		"react-dom": "^17.0.2"
diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md
index 4b1b4e7adf1f..bd0a7463f0ab 100644
--- a/packages/web-ui-registration/CHANGELOG.md
+++ b/packages/web-ui-registration/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/web-ui-registration
 
+## 12.0.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@12.0.0-rc.4
+  </details>
+
 ## 12.0.0-rc.3
 
 ### Patch Changes
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index 1a67d0c9a0c8..10bf6c8eaf9a 100644
--- a/packages/web-ui-registration/package.json
+++ b/packages/web-ui-registration/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/web-ui-registration",
-	"version": "12.0.0-rc.3",
+	"version": "12.0.0-rc.4",
 	"private": true,
 	"homepage": "https://rocket.chat",
 	"main": "./dist/index.js",
@@ -49,7 +49,7 @@
 	"peerDependencies": {
 		"@rocket.chat/layout": "*",
 		"@rocket.chat/tools": "0.2.2",
-		"@rocket.chat/ui-contexts": "12.0.0-rc.3",
+		"@rocket.chat/ui-contexts": "12.0.0-rc.4",
 		"@tanstack/react-query": "*",
 		"react": "*",
 		"react-hook-form": "*",
diff --git a/yarn.lock b/yarn.lock
index a625b3a04498..1dd1e3b1ef08 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8518,10 +8518,10 @@ __metadata:
     "@rocket.chat/icons": "*"
     "@rocket.chat/prettier-config": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 8.0.0-rc.2
-    "@rocket.chat/ui-contexts": 12.0.0-rc.2
+    "@rocket.chat/ui-avatar": 8.0.0-rc.3
+    "@rocket.chat/ui-contexts": 12.0.0-rc.3
     "@rocket.chat/ui-kit": 0.37.0-rc.0
-    "@rocket.chat/ui-video-conf": 12.0.0-rc.2
+    "@rocket.chat/ui-video-conf": 12.0.0-rc.3
     "@tanstack/react-query": "*"
     react: ~17.0.2
     react-dom: "*"
@@ -8607,8 +8607,8 @@ __metadata:
     "@rocket.chat/fuselage-tokens": "*"
     "@rocket.chat/message-parser": 0.31.31
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-client": 12.0.0-rc.2
-    "@rocket.chat/ui-contexts": 12.0.0-rc.2
+    "@rocket.chat/ui-client": 12.0.0-rc.3
+    "@rocket.chat/ui-contexts": 12.0.0-rc.3
     katex: "*"
     react: "*"
   languageName: unknown
@@ -9860,7 +9860,7 @@ __metadata:
     typescript: "npm:~5.6.3"
   peerDependencies:
     "@rocket.chat/fuselage": "*"
-    "@rocket.chat/ui-contexts": 12.0.0-rc.2
+    "@rocket.chat/ui-contexts": 12.0.0-rc.3
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -9910,8 +9910,8 @@ __metadata:
     "@rocket.chat/fuselage": "*"
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
-    "@rocket.chat/ui-avatar": 8.0.0-rc.2
-    "@rocket.chat/ui-contexts": 12.0.0-rc.2
+    "@rocket.chat/ui-avatar": 8.0.0-rc.3
+    "@rocket.chat/ui-contexts": 12.0.0-rc.3
     react: "*"
     react-i18next: "*"
   languageName: unknown
@@ -10081,8 +10081,8 @@ __metadata:
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 8.0.0-rc.2
-    "@rocket.chat/ui-contexts": 12.0.0-rc.2
+    "@rocket.chat/ui-avatar": 8.0.0-rc.3
+    "@rocket.chat/ui-contexts": 12.0.0-rc.3
     react: ~17.0.2
     react-dom: ^17.0.2
   languageName: unknown
@@ -10136,9 +10136,9 @@ __metadata:
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 8.0.0-rc.2
-    "@rocket.chat/ui-client": 12.0.0-rc.2
-    "@rocket.chat/ui-contexts": 12.0.0-rc.2
+    "@rocket.chat/ui-avatar": 8.0.0-rc.3
+    "@rocket.chat/ui-client": 12.0.0-rc.3
+    "@rocket.chat/ui-contexts": 12.0.0-rc.3
     react: ~17.0.2
     react-aria: ~3.23.1
     react-dom: ^17.0.2
@@ -10227,7 +10227,7 @@ __metadata:
   peerDependencies:
     "@rocket.chat/layout": "*"
     "@rocket.chat/tools": 0.2.2
-    "@rocket.chat/ui-contexts": 12.0.0-rc.2
+    "@rocket.chat/ui-contexts": 12.0.0-rc.3
     "@tanstack/react-query": "*"
     react: "*"
     react-hook-form: "*"

From 6e2a706a44b61239e952acc4182dc0dd2c24c9f7 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Fri, 25 Oct 2024 17:16:42 -0300
Subject: [PATCH 21/22] chore: bump safe deps (#33736)

---
 apps/meteor/ee/server/services/package.json   |   6 +-
 apps/meteor/package.json                      |  22 +-
 apps/uikit-playground/package.json            |   6 +-
 ee/apps/account-service/package.json          |   2 +-
 ee/apps/authorization-service/package.json    |   2 +-
 ee/apps/ddp-streamer/package.json             |   2 +-
 ee/apps/omnichannel-transcript/package.json   |   2 +-
 ee/apps/presence-service/package.json         |   2 +-
 ee/apps/queue-worker/package.json             |   2 +-
 ee/apps/stream-hub-service/package.json       |   2 +-
 ee/packages/license/package.json              |   2 +-
 ee/packages/network-broker/package.json       |   2 +-
 ee/packages/omnichannel-services/package.json |   6 +-
 ee/packages/pdf-worker/package.json           |   4 +-
 packages/api-client/package.json              |   2 +-
 packages/core-services/package.json           |   2 +-
 packages/ddp-client/package.json              |   2 +-
 packages/freeswitch/package.json              |   2 +-
 packages/fuselage-ui-kit/package.json         |   4 +-
 packages/gazzodown/package.json               |   8 +-
 packages/jest-presets/package.json            |   4 +-
 packages/jwt/package.json                     |   2 +-
 packages/livechat/package.json                |   8 +-
 packages/logger/package.json                  |   2 +-
 packages/message-parser/package.json          |   2 +-
 packages/mock-providers/package.json          |   2 +-
 packages/models/package.json                  |   2 +-
 packages/password-policies/package.json       |   2 +-
 packages/patch-injection/package.json         |   2 +-
 packages/rest-typings/package.json            |   4 +-
 packages/tools/package.json                   |   2 +-
 packages/tracing/package.json                 |   2 +-
 packages/ui-client/package.json               |   4 +-
 packages/ui-composer/package.json             |   2 +-
 packages/ui-kit/package.json                  |   2 +-
 packages/ui-video-conf/package.json           |   4 +-
 packages/ui-voip/package.json                 |   6 +-
 packages/web-ui-registration/package.json     |   4 +-
 yarn.lock                                     | 592 +++++++++---------
 39 files changed, 369 insertions(+), 361 deletions(-)

diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index 39ec14932fe8..311344d00cf4 100644
--- a/apps/meteor/ee/server/services/package.json
+++ b/apps/meteor/ee/server/services/package.json
@@ -27,7 +27,7 @@
 		"@rocket.chat/rest-typings": "workspace:^",
 		"@rocket.chat/string-helpers": "~0.31.25",
 		"@rocket.chat/ui-kit": "workspace:~",
-		"ajv": "^8.11.0",
+		"ajv": "^8.17.1",
 		"bcrypt": "^5.0.1",
 		"body-parser": "^1.20.3",
 		"colorette": "^2.0.20",
@@ -35,13 +35,13 @@
 		"cookie-parser": "^1.4.7",
 		"ejson": "^2.2.3",
 		"eventemitter3": "^4.0.7",
-		"express": "^4.17.3",
+		"express": "^4.21.1",
 		"jaeger-client": "^3.19.0",
 		"mem": "^8.1.1",
 		"moleculer": "^0.14.34",
 		"mongodb": "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch",
 		"nats": "^2.6.1",
-		"pino": "^8.15.0",
+		"pino": "^8.21.0",
 		"sodium-native": "^3.3.0",
 		"sodium-plus": "^0.9.0",
 		"uuid": "^8.3.2",
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index 6d48ccde9994..7a7fb45404f9 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -111,7 +111,7 @@
 		"@types/he": "^1.1.2",
 		"@types/i18next-sprintf-postprocessor": "^0.2.3",
 		"@types/imap": "^0.8.40",
-		"@types/jest": "~29.5.13",
+		"@types/jest": "~29.5.14",
 		"@types/jsdom": "^16.2.15",
 		"@types/jsdom-global": "^3.0.7",
 		"@types/jsrsasign": "^10.5.14",
@@ -205,7 +205,7 @@
 		"react-docgen-typescript-plugin": "^1.0.8",
 		"sinon": "^19.0.2",
 		"source-map": "^0.7.4",
-		"storybook": "^8.3.5",
+		"storybook": "^8.3.6",
 		"stylelint": "^14.9.1",
 		"stylelint-order": "^5.0.0",
 		"supertest": "^7.0.0",
@@ -293,11 +293,11 @@
 		"@rocket.chat/web-ui-registration": "workspace:^",
 		"@slack/bolt": "^3.14.0",
 		"@slack/rtm-api": "^6.0.0",
-		"@tanstack/react-query": "^4.16.1",
+		"@tanstack/react-query": "^4.36.1",
 		"@vector-im/matrix-bot-sdk": "0.7.1-element.6",
 		"@xmldom/xmldom": "^0.8.10",
 		"adm-zip": "0.5.16",
-		"ajv": "^8.11.0",
+		"ajv": "^8.17.1",
 		"ajv-formats": "~2.1.1",
 		"apn": "2.2.0",
 		"archiver": "^3.1.1",
@@ -324,7 +324,7 @@
 		"cron-validator": "^1.3.1",
 		"css-vars-ponyfill": "^2.4.9",
 		"csv-parse": "^5.2.0",
-		"date-fns": "^2.28.0",
+		"date-fns": "^2.30.0",
 		"date.js": "~0.3.3",
 		"debug": "~4.1.1",
 		"dompurify": "^3.1.7",
@@ -336,7 +336,7 @@
 		"eventemitter3": "^4.0.7",
 		"exif-be-gone": "^1.3.2",
 		"expiry-map": "^2.0.0",
-		"express": "^4.17.3",
+		"express": "^4.21.1",
 		"express-rate-limit": "^5.5.1",
 		"fastq": "^1.13.0",
 		"fflate": "^0.7.4",
@@ -347,7 +347,7 @@
 		"google-libphonenumber": "^3.2.38",
 		"gravatar": "^1.8.2",
 		"he": "^1.2.0",
-		"highlight.js": "^11.6.0",
+		"highlight.js": "^11.10.0",
 		"hljs9": "npm:highlight.js@^9.18.5",
 		"http-proxy-agent": "^5.0.0",
 		"human-interval": "^2.0.1",
@@ -362,7 +362,7 @@
 		"jschardet": "^3.0.0",
 		"jsdom": "^16.7.0",
 		"jsrsasign": "^11.1.0",
-		"juice": "^8.0.0",
+		"juice": "^8.1.0",
 		"katex": "~0.16.11",
 		"ldap-escape": "^2.0.6",
 		"ldapjs": "^2.3.3",
@@ -396,7 +396,7 @@
 		"path": "^0.12.7",
 		"path-to-regexp": "^6.3.0",
 		"pdfjs-dist": "^2.16.105",
-		"pino": "^8.15.0",
+		"pino": "^8.21.0",
 		"postis": "^2.2.0",
 		"prom-client": "^14.2.0",
 		"prometheus-gc-stats": "^0.6.5",
@@ -405,7 +405,7 @@
 		"query-string": "^7.1.3",
 		"queue-fifo": "^0.2.6",
 		"rc-scrollbars": "^1.1.6",
-		"re-resizable": "^6.9.18",
+		"re-resizable": "^6.10.0",
 		"react": "~17.0.2",
 		"react-aria": "~3.23.1",
 		"react-dom": "~17.0.2",
@@ -413,7 +413,7 @@
 		"react-hook-form": "~7.45.4",
 		"react-i18next": "~13.2.2",
 		"react-keyed-flatten-children": "^1.3.0",
-		"react-virtuoso": "^4.7.1",
+		"react-virtuoso": "^4.12.0",
 		"sanitize-html": "^2.13.1",
 		"semver": "^7.6.3",
 		"sharp": "^0.32.6",
diff --git a/apps/uikit-playground/package.json b/apps/uikit-playground/package.json
index 7bb295831447..770ef3f0b35a 100644
--- a/apps/uikit-playground/package.json
+++ b/apps/uikit-playground/package.json
@@ -34,10 +34,10 @@
     "react": "^17.0.2",
     "react-beautiful-dnd": "^13.1.1",
     "react-dom": "^17.0.2",
-    "react-router-dom": "^6.11.2",
+    "react-router-dom": "^6.27.0",
     "react-split-pane": "^0.1.92",
-    "react-virtuoso": "^4.7.1",
-    "reactflow": "^11.7.2"
+    "react-virtuoso": "^4.12.0",
+    "reactflow": "^11.11.4"
   },
   "devDependencies": {
     "@types/react": "~17.0.80",
diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json
index d16650ab8d58..ca8cc1a9c6ee 100644
--- a/ee/apps/account-service/package.json
+++ b/ee/apps/account-service/package.json
@@ -35,7 +35,7 @@
 		"moleculer": "^0.14.34",
 		"mongodb": "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch",
 		"nats": "^2.4.0",
-		"pino": "^8.15.0",
+		"pino": "^8.21.0",
 		"polka": "^0.5.2",
 		"uuid": "^9.0.1"
 	},
diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json
index 597d3e409bb2..f97d047fd7b6 100644
--- a/ee/apps/authorization-service/package.json
+++ b/ee/apps/authorization-service/package.json
@@ -33,7 +33,7 @@
 		"moleculer": "^0.14.34",
 		"mongodb": "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch",
 		"nats": "^2.4.0",
-		"pino": "^8.15.0",
+		"pino": "^8.21.0",
 		"polka": "^0.5.2"
 	},
 	"devDependencies": {
diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
index 5d258120daa4..c5ca576b1d48 100644
--- a/ee/apps/ddp-streamer/package.json
+++ b/ee/apps/ddp-streamer/package.json
@@ -36,7 +36,7 @@
 		"moleculer": "^0.14.34",
 		"mongodb": "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch",
 		"nats": "^2.4.0",
-		"pino": "^8.15.0",
+		"pino": "^8.21.0",
 		"polka": "^0.5.2",
 		"sharp": "^0.32.6",
 		"underscore": "^1.13.7",
diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json
index 80e4b4e4df4f..ff8d78857ced 100644
--- a/ee/apps/omnichannel-transcript/package.json
+++ b/ee/apps/omnichannel-transcript/package.json
@@ -39,7 +39,7 @@
 		"mongo-message-queue": "^1.0.0",
 		"mongodb": "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch",
 		"nats": "^2.4.0",
-		"pino": "^8.15.0",
+		"pino": "^8.21.0",
 		"polka": "^0.5.2"
 	},
 	"devDependencies": {
diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json
index f9ca853ca550..269e77bb6134 100644
--- a/ee/apps/presence-service/package.json
+++ b/ee/apps/presence-service/package.json
@@ -33,7 +33,7 @@
 		"moleculer": "^0.14.34",
 		"mongodb": "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch",
 		"nats": "^2.4.0",
-		"pino": "^8.15.0",
+		"pino": "^8.21.0",
 		"polka": "^0.5.2"
 	},
 	"devDependencies": {
diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json
index fdde9ae58b45..30f482ede5ab 100644
--- a/ee/apps/queue-worker/package.json
+++ b/ee/apps/queue-worker/package.json
@@ -36,7 +36,7 @@
 		"mongo-message-queue": "^1.0.0",
 		"mongodb": "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch",
 		"nats": "^2.4.0",
-		"pino": "^8.15.0",
+		"pino": "^8.21.0",
 		"polka": "^0.5.2"
 	},
 	"devDependencies": {
diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json
index 69efc6df3f5d..3f16ccfcc809 100644
--- a/ee/apps/stream-hub-service/package.json
+++ b/ee/apps/stream-hub-service/package.json
@@ -33,7 +33,7 @@
 		"moleculer": "^0.14.34",
 		"mongodb": "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch",
 		"nats": "^2.4.0",
-		"pino": "^8.15.0",
+		"pino": "^8.21.0",
 		"polka": "^0.5.2"
 	},
 	"devDependencies": {
diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json
index 1d9fc2733d7f..c376fe12f37c 100644
--- a/ee/packages/license/package.json
+++ b/ee/packages/license/package.json
@@ -5,7 +5,7 @@
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/bcrypt": "^5.0.2",
-		"@types/jest": "~29.5.13",
+		"@types/jest": "~29.5.14",
 		"@types/ws": "^8.5.12",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
diff --git a/ee/packages/network-broker/package.json b/ee/packages/network-broker/package.json
index d1cc71733da2..a323e1a11deb 100644
--- a/ee/packages/network-broker/package.json
+++ b/ee/packages/network-broker/package.json
@@ -34,6 +34,6 @@
 		"@rocket.chat/core-services": "workspace:^",
 		"ejson": "^2.2.3",
 		"moleculer": "^0.14.34",
-		"pino": "^8.15.0"
+		"pino": "^8.21.0"
 	}
 }
diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json
index 5c135d03243e..4dd23a811a95 100644
--- a/ee/packages/omnichannel-services/package.json
+++ b/ee/packages/omnichannel-services/package.json
@@ -5,7 +5,7 @@
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
 		"@rocket.chat/jest-presets": "workspace:~",
-		"@types/jest": "~29.5.13",
+		"@types/jest": "~29.5.14",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"typescript": "~5.6.3"
@@ -22,7 +22,7 @@
 		"@rocket.chat/string-helpers": "~0.31.25",
 		"@rocket.chat/tools": "workspace:^",
 		"@types/node": "~20.16.12",
-		"date-fns": "^2.28.0",
+		"date-fns": "^2.30.0",
 		"ejson": "^2.2.3",
 		"emoji-toolkit": "^7.0.1",
 		"eventemitter3": "^4.0.7",
@@ -30,7 +30,7 @@
 		"moment-timezone": "^0.5.46",
 		"mongo-message-queue": "^1.0.0",
 		"mongodb": "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch",
-		"pino": "^8.15.0"
+		"pino": "^8.21.0"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json
index a5fe9ef3d217..a873095e387b 100644
--- a/ee/packages/pdf-worker/package.json
+++ b/ee/packages/pdf-worker/package.json
@@ -35,14 +35,14 @@
 		"@storybook/react-webpack5": "^8.3.5",
 		"@testing-library/react": "~16.0.1",
 		"@types/emojione": "^2.2.9",
-		"@types/jest": "~29.5.13",
+		"@types/jest": "~29.5.14",
 		"@types/react": "~17.0.80",
 		"@types/react-dom": "~17.0.25",
 		"buffer": "~6.0.3",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"react-dom": "~18.3.1",
-		"storybook": "^8.3.5",
+		"storybook": "^8.3.6",
 		"typescript": "~5.6.3"
 	},
 	"volta": {
diff --git a/packages/api-client/package.json b/packages/api-client/package.json
index 76d3d1f44d50..a589b6bf8676 100644
--- a/packages/api-client/package.json
+++ b/packages/api-client/package.json
@@ -3,7 +3,7 @@
 	"version": "0.2.9-rc.3",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
-		"@types/jest": "~29.5.13",
+		"@types/jest": "~29.5.14",
 		"@types/strict-uri-encode": "^2.0.2",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
diff --git a/packages/core-services/package.json b/packages/core-services/package.json
index 97a43a683fc6..e162191adf7a 100644
--- a/packages/core-services/package.json
+++ b/packages/core-services/package.json
@@ -9,7 +9,7 @@
 		"@rocket.chat/apps-engine": "workspace:^",
 		"@rocket.chat/eslint-config": "workspace:^",
 		"@rocket.chat/jest-presets": "workspace:~",
-		"@types/jest": "~29.5.13",
+		"@types/jest": "~29.5.14",
 		"babel-jest": "^29.5.0",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
diff --git a/packages/ddp-client/package.json b/packages/ddp-client/package.json
index 904fc7b1b075..97800d6c6432 100644
--- a/packages/ddp-client/package.json
+++ b/packages/ddp-client/package.json
@@ -3,7 +3,7 @@
 	"version": "0.3.9-rc.3",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
-		"@types/jest": "~29.5.13",
+		"@types/jest": "~29.5.14",
 		"@types/ws": "^8.5.12",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
diff --git a/packages/freeswitch/package.json b/packages/freeswitch/package.json
index f4362426a0f6..00263407e9c0 100644
--- a/packages/freeswitch/package.json
+++ b/packages/freeswitch/package.json
@@ -4,7 +4,7 @@
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
-		"@types/jest": "~29.5.12",
+		"@types/jest": "~29.5.14",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"typescript": "~5.3.3"
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index 56fa8c324666..28d2a801bf4f 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -71,7 +71,7 @@
 		"@storybook/react": "^8.3.5",
 		"@storybook/react-webpack5": "^8.3.5",
 		"@storybook/theming": "^8.3.5",
-		"@tanstack/react-query": "^4.16.1",
+		"@tanstack/react-query": "^4.36.1",
 		"@testing-library/react": "~16.0.1",
 		"@testing-library/user-event": "~14.5.2",
 		"@types/react": "~17.0.80",
@@ -88,7 +88,7 @@
 		"react-dom": "^17.0.2",
 		"react-i18next": "~13.2.2",
 		"rimraf": "^6.0.1",
-		"storybook": "^8.3.5",
+		"storybook": "^8.3.6",
 		"storybook-dark-mode": "^4.0.2",
 		"typescript": "~5.6.3"
 	},
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index 3207e71b022c..e50816df3fa1 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -21,9 +21,8 @@
 		"typecheck": "tsc --noEmit"
 	},
 	"dependencies": {
-		"date-fns": "^3.3.1",
 		"dompurify": "^3.1.7",
-		"highlight.js": "^11.5.1",
+		"highlight.js": "^11.10.0",
 		"react-error-boundary": "^3.1.4"
 	},
 	"devDependencies": {
@@ -48,7 +47,7 @@
 		"@storybook/react-webpack5": "^8.3.5",
 		"@testing-library/react": "~16.0.1",
 		"@types/dompurify": "^3.0.5",
-		"@types/jest": "~29.5.13",
+		"@types/jest": "~29.5.14",
 		"@types/katex": "~0.16.7",
 		"@types/react": "~17.0.80",
 		"@types/react-dom": "~17.0.25",
@@ -65,7 +64,7 @@
 		"katex": "~0.16.11",
 		"outdent": "^0.8.0",
 		"react-dom": "~17.0.2",
-		"storybook": "^8.3.5",
+		"storybook": "^8.3.6",
 		"typescript": "~5.6.3"
 	},
 	"peerDependencies": {
@@ -77,6 +76,7 @@
 		"@rocket.chat/styled": "*",
 		"@rocket.chat/ui-client": "12.0.0-rc.3",
 		"@rocket.chat/ui-contexts": "12.0.0-rc.3",
+		"date-fns": "*",
 		"katex": "*",
 		"react": "*"
 	},
diff --git a/packages/jest-presets/package.json b/packages/jest-presets/package.json
index f0809089d248..7d289bb3a717 100644
--- a/packages/jest-presets/package.json
+++ b/packages/jest-presets/package.json
@@ -13,7 +13,7 @@
 		"/server"
 	],
 	"dependencies": {
-		"@swc/core": "~1.7.26",
+		"@swc/core": "~1.7.39",
 		"@swc/jest": "~0.2.36",
 		"@testing-library/jest-dom": "~6.4.8",
 		"@types/jest-axe": "~3.5.9",
@@ -26,7 +26,7 @@
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:~",
 		"@types/identity-obj-proxy": "^3.0.2",
-		"@types/jest": "~29.5.13",
+		"@types/jest": "~29.5.14",
 		"@types/uuid": "^9.0.8",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
diff --git a/packages/jwt/package.json b/packages/jwt/package.json
index ccc38eb48a98..c8636fb6e404 100644
--- a/packages/jwt/package.json
+++ b/packages/jwt/package.json
@@ -4,7 +4,7 @@
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
-		"@types/jest": "~29.5.13",
+		"@types/jest": "~29.5.14",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"typescript": "~5.6.3"
diff --git a/packages/livechat/package.json b/packages/livechat/package.json
index dab0fe2c0a90..6d83338a711f 100644
--- a/packages/livechat/package.json
+++ b/packages/livechat/package.json
@@ -79,10 +79,10 @@
 		"react-dom": "~17.0.2",
 		"resolve-url-loader": "~5.0.0",
 		"rimraf": "^6.0.1",
-		"sass": "~1.79.5",
+		"sass": "~1.80.4",
 		"sass-loader": "~16.0.2",
 		"serve": "^11.3.2",
-		"storybook": "^8.3.5",
+		"storybook": "^8.3.6",
 		"style-loader": "^1.2.1",
 		"stylelint": "^14.9.1",
 		"stylelint-order": "^5.0.0",
@@ -106,7 +106,7 @@
 		"@rocket.chat/sdk": "^1.0.0-alpha.42",
 		"@rocket.chat/ui-kit": "workspace:~",
 		"css-vars-ponyfill": "^2.4.9",
-		"date-fns": "^2.15.0",
+		"date-fns": "^2.30.0",
 		"emoji-mart": "^3.0.1",
 		"history": "~5.3.0",
 		"i18next": "~23.4.9",
@@ -114,7 +114,7 @@
 		"mem": "^6.1.1",
 		"mitt": "^2.1.0",
 		"path-to-regexp": "^6.3.0",
-		"preact": "~10.24.2",
+		"preact": "~10.24.3",
 		"preact-router": "^3.2.1",
 		"query-string": "^7.1.3",
 		"react-hook-form": "~7.45.4",
diff --git a/packages/logger/package.json b/packages/logger/package.json
index 8f0d1a9a7738..d372f0da7ebe 100644
--- a/packages/logger/package.json
+++ b/packages/logger/package.json
@@ -19,6 +19,6 @@
 	],
 	"dependencies": {
 		"@rocket.chat/emitter": "~0.31.25",
-		"pino": "^8.15.0"
+		"pino": "^8.21.0"
 	}
 }
diff --git a/packages/message-parser/package.json b/packages/message-parser/package.json
index c171baa00fa9..712b1423ca35 100644
--- a/packages/message-parser/package.json
+++ b/packages/message-parser/package.json
@@ -55,7 +55,7 @@
     "@rocket.chat/jest-presets": "workspace:~",
     "@rocket.chat/peggy-loader": "workspace:~",
     "@rocket.chat/prettier-config": "~0.31.25",
-    "@types/jest": "~29.5.13",
+    "@types/jest": "~29.5.14",
     "@types/node": "~20.16.12",
     "@typescript-eslint/parser": "~5.58.0",
     "babel-loader": "~9.1.3",
diff --git a/packages/mock-providers/package.json b/packages/mock-providers/package.json
index 1ae6db0b528d..68ac3d280fbf 100644
--- a/packages/mock-providers/package.json
+++ b/packages/mock-providers/package.json
@@ -13,7 +13,7 @@
 	"devDependencies": {
 		"@rocket.chat/ddp-client": "workspace:~",
 		"@rocket.chat/ui-contexts": "workspace:*",
-		"@tanstack/react-query": "^4.16.1",
+		"@tanstack/react-query": "^4.36.1",
 		"@types/use-sync-external-store": "^0.0.6",
 		"eslint": "~8.45.0",
 		"react": "~17.0.2",
diff --git a/packages/models/package.json b/packages/models/package.json
index 58c96184b345..8b7708fdfa7e 100644
--- a/packages/models/package.json
+++ b/packages/models/package.json
@@ -4,7 +4,7 @@
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
-		"@types/jest": "~29.5.13",
+		"@types/jest": "~29.5.14",
 		"eslint": "~8.45.0",
 		"jest": "^29.7.0",
 		"typescript": "~5.6.3"
diff --git a/packages/password-policies/package.json b/packages/password-policies/package.json
index ecde88b09a5e..aef8b5cffba3 100644
--- a/packages/password-policies/package.json
+++ b/packages/password-policies/package.json
@@ -4,7 +4,7 @@
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
-		"@types/jest": "~29.5.13",
+		"@types/jest": "~29.5.14",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"typescript": "~5.6.3"
diff --git a/packages/patch-injection/package.json b/packages/patch-injection/package.json
index 895f9d5d3c38..8899f4720e2f 100644
--- a/packages/patch-injection/package.json
+++ b/packages/patch-injection/package.json
@@ -4,7 +4,7 @@
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
-		"@types/jest": "~29.5.13",
+		"@types/jest": "~29.5.14",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"typescript": "~5.6.3"
diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json
index 57174562dc9c..f24723624c26 100644
--- a/packages/rest-typings/package.json
+++ b/packages/rest-typings/package.json
@@ -4,7 +4,7 @@
 	"devDependencies": {
 		"@rocket.chat/apps-engine": "workspace:^",
 		"@rocket.chat/eslint-config": "workspace:~",
-		"@types/jest": "~29.5.13",
+		"@types/jest": "~29.5.14",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"mongodb": "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch",
@@ -27,7 +27,7 @@
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/message-parser": "workspace:^",
 		"@rocket.chat/ui-kit": "workspace:~",
-		"ajv": "^8.11.0",
+		"ajv": "^8.17.1",
 		"ajv-formats": "^2.1.1"
 	},
 	"volta": {
diff --git a/packages/tools/package.json b/packages/tools/package.json
index 23555ff93b57..a5a655d83aee 100644
--- a/packages/tools/package.json
+++ b/packages/tools/package.json
@@ -4,7 +4,7 @@
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
-		"@types/jest": "~29.5.13",
+		"@types/jest": "~29.5.14",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"typescript": "~5.6.3"
diff --git a/packages/tracing/package.json b/packages/tracing/package.json
index ef19ad071b9f..47d8b961e689 100644
--- a/packages/tracing/package.json
+++ b/packages/tracing/package.json
@@ -3,7 +3,7 @@
 	"version": "0.0.1",
 	"private": true,
 	"devDependencies": {
-		"@types/jest": "~29.5.7",
+		"@types/jest": "~29.5.14",
 		"eslint": "~8.45.0",
 		"jest": "~29.6.4",
 		"ts-jest": "~29.1.1",
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index 94684b465d05..67ad26063055 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -38,7 +38,7 @@
 		"@storybook/react": "^8.3.5",
 		"@storybook/react-webpack5": "^8.3.5",
 		"@testing-library/react": "~16.0.1",
-		"@types/jest": "~29.5.13",
+		"@types/jest": "~29.5.14",
 		"@types/react": "~17.0.80",
 		"@types/react-dom": "~17.0.25",
 		"eslint": "~8.45.0",
@@ -51,7 +51,7 @@
 		"react": "^17.0.2",
 		"react-dom": "^17.0.2",
 		"react-hook-form": "~7.45.4",
-		"storybook": "^8.3.5",
+		"storybook": "^8.3.6",
 		"typescript": "~5.6.3"
 	},
 	"peerDependencies": {
diff --git a/packages/ui-composer/package.json b/packages/ui-composer/package.json
index 94ad6a682955..33d5da1bac1e 100644
--- a/packages/ui-composer/package.json
+++ b/packages/ui-composer/package.json
@@ -38,7 +38,7 @@
 		"eslint-plugin-storybook": "^0.9.0",
 		"react": "~17.0.2",
 		"react-dom": "~17.0.2",
-		"storybook": "^8.3.5",
+		"storybook": "^8.3.6",
 		"typescript": "~5.6.3"
 	},
 	"peerDependencies": {
diff --git a/packages/ui-kit/package.json b/packages/ui-kit/package.json
index 156bc187690f..5735fe477a85 100644
--- a/packages/ui-kit/package.json
+++ b/packages/ui-kit/package.json
@@ -42,7 +42,7 @@
 		"@rocket.chat/eslint-config": "workspace:~",
 		"@rocket.chat/icons": "~0.38.0",
 		"@rocket.chat/jest-presets": "workspace:~",
-		"@types/jest": "~29.5.13",
+		"@types/jest": "~29.5.14",
 		"babel-loader": "~9.1.3",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index 9b063ed2dd20..b535019363ae 100644
--- a/packages/ui-video-conf/package.json
+++ b/packages/ui-video-conf/package.json
@@ -39,7 +39,7 @@
 		"@storybook/addon-webpack5-compiler-babel": "^3.0.3",
 		"@storybook/react": "^8.3.5",
 		"@storybook/react-webpack5": "^8.3.5",
-		"@types/jest": "~29.5.13",
+		"@types/jest": "~29.5.14",
 		"@types/jest-axe": "~3.5.9",
 		"@types/react": "~17.0.80",
 		"eslint": "~8.45.0",
@@ -49,7 +49,7 @@
 		"jest": "~29.7.0",
 		"jest-axe": "~9.0.0",
 		"react": "~17.0.2",
-		"storybook": "^8.3.5",
+		"storybook": "^8.3.6",
 		"typescript": "~5.6.3"
 	},
 	"peerDependencies": {
diff --git a/packages/ui-voip/package.json b/packages/ui-voip/package.json
index ff25c6795899..b01f63b53892 100644
--- a/packages/ui-voip/package.json
+++ b/packages/ui-voip/package.json
@@ -19,7 +19,7 @@
 	},
 	"dependencies": {
 		"@rocket.chat/emitter": "~0.31.25",
-		"@tanstack/react-query": "^4.16.1",
+		"@tanstack/react-query": "^4.36.1",
 		"react-i18next": "~13.2.2",
 		"sip.js": "^0.20.1"
 	},
@@ -47,7 +47,7 @@
 		"@storybook/react-webpack5": "^8.3.5",
 		"@testing-library/react": "~16.0.1",
 		"@testing-library/user-event": "~14.5.2",
-		"@types/jest": "~29.5.12",
+		"@types/jest": "~29.5.14",
 		"@types/jest-axe": "~3.5.9",
 		"@types/react": "~17.0.80",
 		"@types/react-dom": "~17.0.25",
@@ -58,7 +58,7 @@
 		"jest": "~29.7.0",
 		"jest-axe": "~9.0.0",
 		"react": "~17.0.2",
-		"storybook": "^8.3.5",
+		"storybook": "^8.3.6",
 		"typescript": "~5.6.3"
 	},
 	"peerDependencies": {
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index 1a67d0c9a0c8..cd6a1e565965 100644
--- a/packages/web-ui-registration/package.json
+++ b/packages/web-ui-registration/package.json
@@ -34,7 +34,7 @@
 		"@storybook/react": "^8.3.5",
 		"@storybook/react-webpack5": "^8.3.5",
 		"@storybook/theming": "^8.3.5",
-		"@tanstack/react-query": "^4.16.1",
+		"@tanstack/react-query": "^4.36.1",
 		"@testing-library/react": "~16.0.1",
 		"@types/react": "~17.0.80",
 		"babel-loader": "~8.3.0",
@@ -42,7 +42,7 @@
 		"react": "~17.0.2",
 		"react-hook-form": "~7.45.4",
 		"react-i18next": "~13.2.2",
-		"storybook": "^8.3.5",
+		"storybook": "^8.3.6",
 		"storybook-dark-mode": "^4.0.2",
 		"typescript": "~5.6.3"
 	},
diff --git a/yarn.lock b/yarn.lock
index 0acf4401d562..1a3c5e14c3c9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2582,6 +2582,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/runtime@npm:^7.21.0":
+  version: 7.25.9
+  resolution: "@babel/runtime@npm:7.25.9"
+  dependencies:
+    regenerator-runtime: "npm:^0.14.0"
+  checksum: 10/8d904cfcb433374b3bb90369452751c94ae69547cdd3679950de4527ac5d04195b9c4a1840482a6f3a84694cb22a6403a7f98b826d60cd945918223a4a6b479c
+  languageName: node
+  linkType: hard
+
 "@babel/runtime@npm:~7.25.7":
   version: 7.25.7
   resolution: "@babel/runtime@npm:7.25.7"
@@ -7939,37 +7948,37 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@reactflow/background@npm:11.2.2":
-  version: 11.2.2
-  resolution: "@reactflow/background@npm:11.2.2"
+"@reactflow/background@npm:11.3.14":
+  version: 11.3.14
+  resolution: "@reactflow/background@npm:11.3.14"
   dependencies:
-    "@reactflow/core": "npm:11.7.2"
+    "@reactflow/core": "npm:11.11.4"
     classcat: "npm:^5.0.3"
-    zustand: "npm:^4.3.1"
+    zustand: "npm:^4.4.1"
   peerDependencies:
     react: ">=17"
     react-dom: ">=17"
-  checksum: 10/2fb7d9f93f2d4a04a7b91ca36c644ce2ca0a09edff1929e0037dacc708ec1c9941de5bf55850a8cb5d7a6ed92cf8bbce2d04bc67646b0626a4e0841865f4fa11
+  checksum: 10/bf6c5c7eaabc72371ae882407299b130ed56c538a60e460a3aa305c8d0ba5a51b1f3cbf244e0c1768ee85324ce2c8fd23eeaf0ece45b570197dacb6348a1e843
   languageName: node
   linkType: hard
 
-"@reactflow/controls@npm:11.1.13":
-  version: 11.1.13
-  resolution: "@reactflow/controls@npm:11.1.13"
+"@reactflow/controls@npm:11.2.14":
+  version: 11.2.14
+  resolution: "@reactflow/controls@npm:11.2.14"
   dependencies:
-    "@reactflow/core": "npm:11.7.2"
+    "@reactflow/core": "npm:11.11.4"
     classcat: "npm:^5.0.3"
-    zustand: "npm:^4.3.1"
+    zustand: "npm:^4.4.1"
   peerDependencies:
     react: ">=17"
     react-dom: ">=17"
-  checksum: 10/6bd9eaf88ace08b99531fa44ea2a7b60a879bf5fa53582d91b7902693a50fc44e5c5bbf19fd08a7e1c5670acea95b783a3502960650e2afa29f01991f2769d77
+  checksum: 10/5ab2f4ee4daf43f22bae18b3d20e9804c8797a32f194b7fd0bf3d90c17f51db0fd09ba34c31408528ae809530dcdf2fde4d44bc044b1aa41ff0eabd972f52505
   languageName: node
   linkType: hard
 
-"@reactflow/core@npm:11.7.2, @reactflow/core@npm:^11.6.0":
-  version: 11.7.2
-  resolution: "@reactflow/core@npm:11.7.2"
+"@reactflow/core@npm:11.11.4":
+  version: 11.11.4
+  resolution: "@reactflow/core@npm:11.11.4"
   dependencies:
     "@types/d3": "npm:^7.4.0"
     "@types/d3-drag": "npm:^3.0.1"
@@ -7979,66 +7988,66 @@ __metadata:
     d3-drag: "npm:^3.0.0"
     d3-selection: "npm:^3.0.0"
     d3-zoom: "npm:^3.0.0"
-    zustand: "npm:^4.3.1"
+    zustand: "npm:^4.4.1"
   peerDependencies:
     react: ">=17"
     react-dom: ">=17"
-  checksum: 10/22401f03f16d360dfcc78a3ed88058b643dda07fe383631fe1e0d2b9153984c3d7b981f8c884dea8a1a45548515c68e9801521b32270c41ce428d7734282b90d
+  checksum: 10/725a876356f44c0efccb43212beaf2e182481aabfb7b5a139926366c1b97e20cec5ad88cf392a7e0a6be3998422c7719cadfc2ab53ec6ff61fa792a36e899599
   languageName: node
   linkType: hard
 
-"@reactflow/minimap@npm:11.5.2":
-  version: 11.5.2
-  resolution: "@reactflow/minimap@npm:11.5.2"
+"@reactflow/minimap@npm:11.7.14":
+  version: 11.7.14
+  resolution: "@reactflow/minimap@npm:11.7.14"
   dependencies:
-    "@reactflow/core": "npm:11.7.2"
+    "@reactflow/core": "npm:11.11.4"
     "@types/d3-selection": "npm:^3.0.3"
     "@types/d3-zoom": "npm:^3.0.1"
     classcat: "npm:^5.0.3"
     d3-selection: "npm:^3.0.0"
     d3-zoom: "npm:^3.0.0"
-    zustand: "npm:^4.3.1"
+    zustand: "npm:^4.4.1"
   peerDependencies:
     react: ">=17"
     react-dom: ">=17"
-  checksum: 10/a79eb3515114858e3d1d8f167e35610b085f711c5df0b18b1e1dab1fe5abc096224925d058df02622ed34cbc9e3f3c6240e7433e5fc47d2adb5cc726cb750c46
+  checksum: 10/3aa9bbfbe2fcbd874b8b41fe3ddb5d221f90f58d17d093c0d5edbfafb540d0dc4cd9785e8802eb18db5bdd730d5705234ab65bd31cfbb71eabf42e49bf2f7cac
   languageName: node
   linkType: hard
 
-"@reactflow/node-resizer@npm:2.1.0":
-  version: 2.1.0
-  resolution: "@reactflow/node-resizer@npm:2.1.0"
+"@reactflow/node-resizer@npm:2.2.14":
+  version: 2.2.14
+  resolution: "@reactflow/node-resizer@npm:2.2.14"
   dependencies:
-    "@reactflow/core": "npm:^11.6.0"
+    "@reactflow/core": "npm:11.11.4"
     classcat: "npm:^5.0.4"
     d3-drag: "npm:^3.0.0"
     d3-selection: "npm:^3.0.0"
-    zustand: "npm:^4.3.1"
+    zustand: "npm:^4.4.1"
   peerDependencies:
     react: ">=17"
     react-dom: ">=17"
-  checksum: 10/e668ccaea31c60f9a5f550b6a4eaccbffbf40251ffecc363c8d3a37c374b5ff1ea854966cce0fca825d6d8c529ed49ccb5fc17ef4054915754a92516a5ec2f23
+  checksum: 10/0440dd32c6364304f92b12a2d8288260d66a825533b99b7705c112362858c676b0a0221adf983bfdbbacbd70388dfcaec69401129e60bfca5c25c9b8302b0aef
   languageName: node
   linkType: hard
 
-"@reactflow/node-toolbar@npm:1.2.1":
-  version: 1.2.1
-  resolution: "@reactflow/node-toolbar@npm:1.2.1"
+"@reactflow/node-toolbar@npm:1.3.14":
+  version: 1.3.14
+  resolution: "@reactflow/node-toolbar@npm:1.3.14"
   dependencies:
-    "@reactflow/core": "npm:11.7.2"
+    "@reactflow/core": "npm:11.11.4"
     classcat: "npm:^5.0.3"
-    zustand: "npm:^4.3.1"
+    zustand: "npm:^4.4.1"
   peerDependencies:
     react: ">=17"
     react-dom: ">=17"
-  checksum: 10/82818fe01a345bd65df40dea6427744b3624b7f4679a15a77574849d8bc8c48dc876dfc37f714263db9914f83c9d868621038cea7cc626a2e87e0fc56896742e
+  checksum: 10/159566da042f29c15e506d4c49cd938b28644ad7710b266e35293c268286c48488b92d7c621f25700bfbabff84470c181ec2683a44c04d1749370c09d2e4a12b
   languageName: node
   linkType: hard
 
-"@remix-run/router@npm:1.6.2":
-  version: 1.6.2
-  resolution: "@remix-run/router@npm:1.6.2"
-  checksum: 10/c261c3b52f08d7fcacce9c66d68dba3b6f0c8263ea15f69f9f1c89734685cdfe4f383c879324acade68cb331d48e3deca9ec00734abe08d9694e529096907f40
+"@remix-run/router@npm:1.20.0":
+  version: 1.20.0
+  resolution: "@remix-run/router@npm:1.20.0"
+  checksum: 10/e1d2420db94a1855b97f1784898d0ae389cf3b77129b8f419e51d4833b77ca2c92ac09e2cb558015324d64580a138fd6faa31e52fcc3ba90e3cc382a1a324d4a
   languageName: node
   linkType: hard
 
@@ -8071,7 +8080,7 @@ __metadata:
     moleculer: "npm:^0.14.34"
     mongodb: "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch"
     nats: "npm:^2.4.0"
-    pino: "npm:^8.15.0"
+    pino: "npm:^8.21.0"
     polka: "npm:^0.5.2"
     ts-node: "npm:^10.9.2"
     typescript: "npm:~5.6.3"
@@ -8111,7 +8120,7 @@ __metadata:
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/rest-typings": "workspace:^"
-    "@types/jest": "npm:~29.5.13"
+    "@types/jest": "npm:~29.5.14"
     "@types/strict-uri-encode": "npm:^2.0.2"
     eslint: "npm:~8.45.0"
     filter-obj: "npm:^3.0.0"
@@ -8203,7 +8212,7 @@ __metadata:
     moleculer: "npm:^0.14.34"
     mongodb: "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch"
     nats: "npm:^2.4.0"
-    pino: "npm:^8.15.0"
+    pino: "npm:^8.21.0"
     polka: "npm:^0.5.2"
     ts-node: "npm:^10.9.2"
     typescript: "npm:~5.6.3"
@@ -8253,7 +8262,7 @@ __metadata:
     "@rocket.chat/rest-typings": "workspace:^"
     "@rocket.chat/tracing": "workspace:^"
     "@rocket.chat/ui-kit": "workspace:~"
-    "@types/jest": "npm:~29.5.13"
+    "@types/jest": "npm:~29.5.14"
     babel-jest: "npm:^29.5.0"
     eslint: "npm:~8.45.0"
     jest: "npm:~29.7.0"
@@ -8324,7 +8333,7 @@ __metadata:
     "@rocket.chat/core-typings": "workspace:~"
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/rest-typings": "workspace:^"
-    "@types/jest": "npm:~29.5.13"
+    "@types/jest": "npm:~29.5.14"
     "@types/ws": "npm:^8.5.12"
     eslint: "npm:~8.45.0"
     jest: "npm:~29.7.0"
@@ -8373,7 +8382,7 @@ __metadata:
     moleculer: "npm:^0.14.34"
     mongodb: "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch"
     nats: "npm:^2.4.0"
-    pino: "npm:^8.15.0"
+    pino: "npm:^8.21.0"
     pino-pretty: "npm:^7.6.1"
     polka: "npm:^0.5.2"
     sharp: "npm:^0.32.6"
@@ -8430,7 +8439,7 @@ __metadata:
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/logger": "workspace:^"
     "@rocket.chat/tools": "workspace:^"
-    "@types/jest": "npm:~29.5.12"
+    "@types/jest": "npm:~29.5.14"
     esl: "github:pierre-lehnen-rc/esl"
     eslint: "npm:~8.45.0"
     jest: "npm:~29.7.0"
@@ -8518,7 +8527,7 @@ __metadata:
     "@storybook/react": "npm:^8.3.5"
     "@storybook/react-webpack5": "npm:^8.3.5"
     "@storybook/theming": "npm:^8.3.5"
-    "@tanstack/react-query": "npm:^4.16.1"
+    "@tanstack/react-query": "npm:^4.36.1"
     "@testing-library/react": "npm:~16.0.1"
     "@testing-library/user-event": "npm:~14.5.2"
     "@types/react": "npm:~17.0.80"
@@ -8535,7 +8544,7 @@ __metadata:
     react-dom: "npm:^17.0.2"
     react-i18next: "npm:~13.2.2"
     rimraf: "npm:^6.0.1"
-    storybook: "npm:^8.3.5"
+    storybook: "npm:^8.3.6"
     storybook-dark-mode: "npm:^4.0.2"
     typescript: "npm:~5.6.3"
   peerDependencies:
@@ -8606,28 +8615,27 @@ __metadata:
     "@storybook/react-webpack5": "npm:^8.3.5"
     "@testing-library/react": "npm:~16.0.1"
     "@types/dompurify": "npm:^3.0.5"
-    "@types/jest": "npm:~29.5.13"
+    "@types/jest": "npm:~29.5.14"
     "@types/katex": "npm:~0.16.7"
     "@types/react": "npm:~17.0.80"
     "@types/react-dom": "npm:~17.0.25"
     "@typescript-eslint/eslint-plugin": "npm:~5.60.1"
     "@typescript-eslint/parser": "npm:~5.60.1"
     babel-loader: "npm:^8.3.0"
-    date-fns: "npm:^3.3.1"
     dompurify: "npm:^3.1.7"
     eslint: "npm:~8.45.0"
     eslint-plugin-anti-trojan-source: "npm:~1.1.1"
     eslint-plugin-react: "npm:~7.32.2"
     eslint-plugin-react-hooks: "npm:~4.6.2"
     eslint-plugin-storybook: "npm:^0.9.0"
-    highlight.js: "npm:^11.5.1"
+    highlight.js: "npm:^11.10.0"
     identity-obj-proxy: "npm:^3.0.0"
     jest: "npm:~29.7.0"
     katex: "npm:~0.16.11"
     outdent: "npm:^0.8.0"
     react-dom: "npm:~17.0.2"
     react-error-boundary: "npm:^3.1.4"
-    storybook: "npm:^8.3.5"
+    storybook: "npm:^8.3.6"
     typescript: "npm:~5.6.3"
   peerDependencies:
     "@rocket.chat/core-typings": "workspace:^"
@@ -8638,6 +8646,7 @@ __metadata:
     "@rocket.chat/styled": "*"
     "@rocket.chat/ui-client": 12.0.0-rc.3
     "@rocket.chat/ui-contexts": 12.0.0-rc.3
+    date-fns: "*"
     katex: "*"
     react: "*"
   languageName: unknown
@@ -8681,11 +8690,11 @@ __metadata:
   resolution: "@rocket.chat/jest-presets@workspace:packages/jest-presets"
   dependencies:
     "@rocket.chat/eslint-config": "workspace:~"
-    "@swc/core": "npm:~1.7.26"
+    "@swc/core": "npm:~1.7.39"
     "@swc/jest": "npm:~0.2.36"
     "@testing-library/jest-dom": "npm:~6.4.8"
     "@types/identity-obj-proxy": "npm:^3.0.2"
-    "@types/jest": "npm:~29.5.13"
+    "@types/jest": "npm:~29.5.14"
     "@types/jest-axe": "npm:~3.5.9"
     "@types/uuid": "npm:^9.0.8"
     eslint: "npm:~8.45.0"
@@ -8704,7 +8713,7 @@ __metadata:
   resolution: "@rocket.chat/jwt@workspace:packages/jwt"
   dependencies:
     "@rocket.chat/jest-presets": "workspace:~"
-    "@types/jest": "npm:~29.5.13"
+    "@types/jest": "npm:~29.5.14"
     eslint: "npm:~8.45.0"
     jest: "npm:~29.7.0"
     jose: "npm:^4.15.9"
@@ -8733,7 +8742,7 @@ __metadata:
     "@rocket.chat/jwt": "workspace:^"
     "@rocket.chat/logger": "workspace:^"
     "@types/bcrypt": "npm:^5.0.2"
-    "@types/jest": "npm:~29.5.13"
+    "@types/jest": "npm:~29.5.14"
     "@types/ws": "npm:^8.5.12"
     bcrypt: "npm:^5.0.1"
     eslint: "npm:~8.45.0"
@@ -8782,7 +8791,7 @@ __metadata:
     css-loader: "npm:^4.3.0"
     css-vars-ponyfill: "npm:^2.4.9"
     cssnano: "npm:^4.1.11"
-    date-fns: "npm:^2.15.0"
+    date-fns: "npm:^2.30.0"
     desvg-loader: "npm:^0.1.0"
     emoji-mart: "npm:^3.0.1"
     eslint: "npm:~8.45.0"
@@ -8812,7 +8821,7 @@ __metadata:
     postcss-logical: "npm:^4.0.2"
     postcss-scss: "npm:^4.0.9"
     postcss-selector-not: "npm:^4.0.1"
-    preact: "npm:~10.24.2"
+    preact: "npm:~10.24.3"
     preact-router: "npm:^3.2.1"
     query-string: "npm:^7.1.3"
     react-dom: "npm:~17.0.2"
@@ -8820,10 +8829,10 @@ __metadata:
     react-i18next: "npm:~13.2.2"
     resolve-url-loader: "npm:~5.0.0"
     rimraf: "npm:^6.0.1"
-    sass: "npm:~1.79.5"
+    sass: "npm:~1.80.4"
     sass-loader: "npm:~16.0.2"
     serve: "npm:^11.3.2"
-    storybook: "npm:^8.3.5"
+    storybook: "npm:^8.3.6"
     storybook-dark-mode: "npm:^4.0.2"
     style-loader: "npm:^1.2.1"
     stylelint: "npm:^14.9.1"
@@ -8862,7 +8871,7 @@ __metadata:
   dependencies:
     "@rocket.chat/emitter": "npm:~0.31.25"
     eslint: "npm:~8.45.0"
-    pino: "npm:^8.15.0"
+    pino: "npm:^8.21.0"
     typescript: "npm:~5.6.3"
   languageName: unknown
   linkType: soft
@@ -8898,7 +8907,7 @@ __metadata:
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/peggy-loader": "workspace:~"
     "@rocket.chat/prettier-config": "npm:~0.31.25"
-    "@types/jest": "npm:~29.5.13"
+    "@types/jest": "npm:~29.5.14"
     "@types/node": "npm:~20.16.12"
     "@typescript-eslint/parser": "npm:~5.58.0"
     babel-loader: "npm:~9.1.3"
@@ -9019,7 +9028,7 @@ __metadata:
     "@storybook/addon-webpack5-compiler-babel": "npm:^3.0.3"
     "@storybook/react": "npm:^8.3.5"
     "@storybook/react-webpack5": "npm:^8.3.5"
-    "@tanstack/react-query": "npm:^4.16.1"
+    "@tanstack/react-query": "npm:^4.36.1"
     "@tanstack/react-query-devtools": "npm:^4.19.1"
     "@testing-library/react": "npm:~16.0.1"
     "@testing-library/user-event": "npm:~14.5.2"
@@ -9049,7 +9058,7 @@ __metadata:
     "@types/he": "npm:^1.1.2"
     "@types/i18next-sprintf-postprocessor": "npm:^0.2.3"
     "@types/imap": "npm:^0.8.40"
-    "@types/jest": "npm:~29.5.13"
+    "@types/jest": "npm:~29.5.14"
     "@types/jsdom": "npm:^16.2.15"
     "@types/jsdom-global": "npm:^3.0.7"
     "@types/jsrsasign": "npm:^10.5.14"
@@ -9101,7 +9110,7 @@ __metadata:
     "@vector-im/matrix-bot-sdk": "npm:0.7.1-element.6"
     "@xmldom/xmldom": "npm:^0.8.10"
     adm-zip: "npm:0.5.16"
-    ajv: "npm:^8.11.0"
+    ajv: "npm:^8.17.1"
     ajv-formats: "npm:~2.1.1"
     apn: "npm:2.2.0"
     archiver: "npm:^3.1.1"
@@ -9138,7 +9147,7 @@ __metadata:
     cross-env: "npm:^7.0.3"
     css-vars-ponyfill: "npm:^2.4.9"
     csv-parse: "npm:^5.2.0"
-    date-fns: "npm:^2.28.0"
+    date-fns: "npm:^2.30.0"
     date.js: "npm:~0.3.3"
     debug: "npm:~4.1.1"
     docker-compose: "npm:^0.24.8"
@@ -9163,7 +9172,7 @@ __metadata:
     eventemitter3: "npm:^4.0.7"
     exif-be-gone: "npm:^1.3.2"
     expiry-map: "npm:^2.0.0"
-    express: "npm:^4.17.3"
+    express: "npm:^4.21.1"
     express-rate-limit: "npm:^5.5.1"
     fast-glob: "npm:^3.2.12"
     fastq: "npm:^1.13.0"
@@ -9175,7 +9184,7 @@ __metadata:
     google-libphonenumber: "npm:^3.2.38"
     gravatar: "npm:^1.8.2"
     he: "npm:^1.2.0"
-    highlight.js: "npm:^11.6.0"
+    highlight.js: "npm:^11.10.0"
     hljs9: "npm:highlight.js@^9.18.5"
     http-proxy-agent: "npm:^5.0.0"
     human-interval: "npm:^2.0.1"
@@ -9193,7 +9202,7 @@ __metadata:
     jsdom: "npm:^16.7.0"
     jsdom-global: "npm:^3.0.2"
     jsrsasign: "npm:^11.1.0"
-    juice: "npm:^8.0.0"
+    juice: "npm:^8.1.0"
     katex: "npm:~0.16.11"
     ldap-escape: "npm:^2.0.6"
     ldapjs: "npm:^2.3.3"
@@ -9230,7 +9239,7 @@ __metadata:
     path: "npm:^0.12.7"
     path-to-regexp: "npm:^6.3.0"
     pdfjs-dist: "npm:^2.16.105"
-    pino: "npm:^8.15.0"
+    pino: "npm:^8.21.0"
     pino-pretty: "npm:^7.6.1"
     playwright-qase-reporter: "npm:^1.2.2"
     postcss: "npm:~8.4.47"
@@ -9251,7 +9260,7 @@ __metadata:
     queue-fifo: "npm:^0.2.6"
     raw-loader: "npm:~4.0.2"
     rc-scrollbars: "npm:^1.1.6"
-    re-resizable: "npm:^6.9.18"
+    re-resizable: "npm:^6.10.0"
     react: "npm:~17.0.2"
     react-aria: "npm:~3.23.1"
     react-docgen-typescript-plugin: "npm:^1.0.8"
@@ -9260,7 +9269,7 @@ __metadata:
     react-hook-form: "npm:~7.45.4"
     react-i18next: "npm:~13.2.2"
     react-keyed-flatten-children: "npm:^1.3.0"
-    react-virtuoso: "npm:^4.7.1"
+    react-virtuoso: "npm:^4.12.0"
     sanitize-html: "npm:^2.13.1"
     semver: "npm:^7.6.3"
     sharp: "npm:^0.32.6"
@@ -9270,7 +9279,7 @@ __metadata:
     sodium-plus: "npm:^0.9.0"
     source-map: "npm:^0.7.4"
     speakeasy: "npm:^2.0.0"
-    storybook: "npm:^8.3.5"
+    storybook: "npm:^8.3.6"
     stream-buffers: "npm:^3.0.3"
     strict-uri-encode: "npm:^2.0.0"
     string-strip-html: "npm:^7.0.3"
@@ -9311,7 +9320,7 @@ __metadata:
     "@rocket.chat/i18n": "workspace:~"
     "@rocket.chat/ui-contexts": "workspace:*"
     "@storybook/react": "npm:^8.3.5"
-    "@tanstack/react-query": "npm:^4.16.1"
+    "@tanstack/react-query": "npm:^4.36.1"
     "@types/use-sync-external-store": "npm:^0.0.6"
     eslint: "npm:~8.45.0"
     i18next: "npm:~23.4.9"
@@ -9343,7 +9352,7 @@ __metadata:
   dependencies:
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/model-typings": "workspace:~"
-    "@types/jest": "npm:~29.5.13"
+    "@types/jest": "npm:~29.5.14"
     eslint: "npm:~8.45.0"
     jest: "npm:^29.7.0"
     typescript: "npm:~5.6.3"
@@ -9374,7 +9383,7 @@ __metadata:
     eslint: "npm:~8.45.0"
     jest: "npm:~29.7.0"
     moleculer: "npm:^0.14.34"
-    pino: "npm:^8.15.0"
+    pino: "npm:^8.21.0"
     sinon: "npm:^19.0.2"
     typescript: "npm:~5.6.3"
   languageName: unknown
@@ -9396,9 +9405,9 @@ __metadata:
     "@rocket.chat/rest-typings": "workspace:^"
     "@rocket.chat/string-helpers": "npm:~0.31.25"
     "@rocket.chat/tools": "workspace:^"
-    "@types/jest": "npm:~29.5.13"
+    "@types/jest": "npm:~29.5.14"
     "@types/node": "npm:~20.16.12"
-    date-fns: "npm:^2.28.0"
+    date-fns: "npm:^2.30.0"
     ejson: "npm:^2.2.3"
     emoji-toolkit: "npm:^7.0.1"
     eslint: "npm:~8.45.0"
@@ -9408,7 +9417,7 @@ __metadata:
     moment-timezone: "npm:^0.5.46"
     mongo-message-queue: "npm:^1.0.0"
     mongodb: "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch"
-    pino: "npm:^8.15.0"
+    pino: "npm:^8.21.0"
     typescript: "npm:~5.6.3"
   languageName: unknown
   linkType: soft
@@ -9445,7 +9454,7 @@ __metadata:
     mongo-message-queue: "npm:^1.0.0"
     mongodb: "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch"
     nats: "npm:^2.4.0"
-    pino: "npm:^8.15.0"
+    pino: "npm:^8.21.0"
     polka: "npm:^0.5.2"
     ts-node: "npm:^10.9.2"
     typescript: "npm:~5.6.3"
@@ -9478,7 +9487,7 @@ __metadata:
   resolution: "@rocket.chat/password-policies@workspace:packages/password-policies"
   dependencies:
     "@rocket.chat/jest-presets": "workspace:~"
-    "@types/jest": "npm:~29.5.13"
+    "@types/jest": "npm:~29.5.14"
     eslint: "npm:~8.45.0"
     jest: "npm:~29.7.0"
     typescript: "npm:~5.6.3"
@@ -9490,7 +9499,7 @@ __metadata:
   resolution: "@rocket.chat/patch-injection@workspace:packages/patch-injection"
   dependencies:
     "@rocket.chat/jest-presets": "workspace:~"
-    "@types/jest": "npm:~29.5.13"
+    "@types/jest": "npm:~29.5.14"
     eslint: "npm:~8.45.0"
     jest: "npm:~29.7.0"
     typescript: "npm:~5.6.3"
@@ -9511,7 +9520,7 @@ __metadata:
     "@storybook/react-webpack5": "npm:^8.3.5"
     "@testing-library/react": "npm:~16.0.1"
     "@types/emojione": "npm:^2.2.9"
-    "@types/jest": "npm:~29.5.13"
+    "@types/jest": "npm:~29.5.14"
     "@types/react": "npm:~17.0.80"
     "@types/react-dom": "npm:~17.0.25"
     buffer: "npm:~6.0.3"
@@ -9523,7 +9532,7 @@ __metadata:
     moment-timezone: "npm:^0.5.46"
     react: "npm:~18.3.1"
     react-dom: "npm:~18.3.1"
-    storybook: "npm:^8.3.5"
+    storybook: "npm:^8.3.6"
     typescript: "npm:~5.6.3"
   languageName: unknown
   linkType: soft
@@ -9583,7 +9592,7 @@ __metadata:
     moleculer: "npm:^0.14.34"
     mongodb: "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch"
     nats: "npm:^2.4.0"
-    pino: "npm:^8.15.0"
+    pino: "npm:^8.21.0"
     polka: "npm:^0.5.2"
     ts-node: "npm:^10.9.2"
     typescript: "npm:~5.6.3"
@@ -9650,7 +9659,7 @@ __metadata:
     mongo-message-queue: "npm:^1.0.0"
     mongodb: "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch"
     nats: "npm:^2.4.0"
-    pino: "npm:^8.15.0"
+    pino: "npm:^8.21.0"
     polka: "npm:^0.5.2"
     ts-node: "npm:^10.9.2"
     typescript: "npm:~5.6.3"
@@ -9716,8 +9725,8 @@ __metadata:
     "@rocket.chat/eslint-config": "workspace:~"
     "@rocket.chat/message-parser": "workspace:^"
     "@rocket.chat/ui-kit": "workspace:~"
-    "@types/jest": "npm:~29.5.13"
-    ajv: "npm:^8.11.0"
+    "@types/jest": "npm:~29.5.14"
+    ajv: "npm:^8.17.1"
     ajv-formats: "npm:^2.1.1"
     eslint: "npm:~8.45.0"
     jest: "npm:~29.7.0"
@@ -9808,7 +9817,7 @@ __metadata:
     moleculer: "npm:^0.14.34"
     mongodb: "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch"
     nats: "npm:^2.4.0"
-    pino: "npm:^8.15.0"
+    pino: "npm:^8.21.0"
     polka: "npm:^0.5.2"
     ts-node: "npm:^10.9.2"
     typescript: "npm:~5.6.3"
@@ -9847,7 +9856,7 @@ __metadata:
   resolution: "@rocket.chat/tools@workspace:packages/tools"
   dependencies:
     "@rocket.chat/jest-presets": "workspace:~"
-    "@types/jest": "npm:~29.5.13"
+    "@types/jest": "npm:~29.5.14"
     eslint: "npm:~8.45.0"
     jest: "npm:~29.7.0"
     moment-timezone: "npm:^0.5.46"
@@ -9862,7 +9871,7 @@ __metadata:
     "@opentelemetry/api": "npm:^1.9.0"
     "@opentelemetry/exporter-trace-otlp-grpc": "npm:^0.53.0"
     "@opentelemetry/sdk-node": "npm:^0.53.0"
-    "@types/jest": "npm:~29.5.7"
+    "@types/jest": "npm:~29.5.14"
     eslint: "npm:~8.45.0"
     jest: "npm:~29.6.4"
     ts-jest: "npm:~29.1.1"
@@ -9917,7 +9926,7 @@ __metadata:
     "@storybook/react": "npm:^8.3.5"
     "@storybook/react-webpack5": "npm:^8.3.5"
     "@testing-library/react": "npm:~16.0.1"
-    "@types/jest": "npm:~29.5.13"
+    "@types/jest": "npm:~29.5.14"
     "@types/react": "npm:~17.0.80"
     "@types/react-dom": "npm:~17.0.25"
     eslint: "npm:~8.45.0"
@@ -9930,7 +9939,7 @@ __metadata:
     react: "npm:^17.0.2"
     react-dom: "npm:^17.0.2"
     react-hook-form: "npm:~7.45.4"
-    storybook: "npm:^8.3.5"
+    storybook: "npm:^8.3.6"
     typescript: "npm:~5.6.3"
   peerDependencies:
     "@react-aria/toolbar": "*"
@@ -9969,7 +9978,7 @@ __metadata:
     eslint-plugin-storybook: "npm:^0.9.0"
     react: "npm:~17.0.2"
     react-dom: "npm:~17.0.2"
-    storybook: "npm:^8.3.5"
+    storybook: "npm:^8.3.6"
     typescript: "npm:~5.6.3"
   peerDependencies:
     "@react-aria/toolbar": "*"
@@ -10023,7 +10032,7 @@ __metadata:
     "@rocket.chat/eslint-config": "workspace:~"
     "@rocket.chat/icons": "npm:~0.38.0"
     "@rocket.chat/jest-presets": "workspace:~"
-    "@types/jest": "npm:~29.5.13"
+    "@types/jest": "npm:~29.5.14"
     babel-loader: "npm:~9.1.3"
     eslint: "npm:~8.45.0"
     jest: "npm:~29.7.0"
@@ -10091,7 +10100,7 @@ __metadata:
     "@storybook/addon-webpack5-compiler-babel": "npm:^3.0.3"
     "@storybook/react": "npm:^8.3.5"
     "@storybook/react-webpack5": "npm:^8.3.5"
-    "@types/jest": "npm:~29.5.13"
+    "@types/jest": "npm:~29.5.14"
     "@types/jest-axe": "npm:~3.5.9"
     "@types/react": "npm:~17.0.80"
     eslint: "npm:~8.45.0"
@@ -10101,7 +10110,7 @@ __metadata:
     jest: "npm:~29.7.0"
     jest-axe: "npm:~9.0.0"
     react: "npm:~17.0.2"
-    storybook: "npm:^8.3.5"
+    storybook: "npm:^8.3.6"
     typescript: "npm:~5.6.3"
   peerDependencies:
     "@rocket.chat/css-in-js": "*"
@@ -10142,10 +10151,10 @@ __metadata:
     "@storybook/addon-webpack5-compiler-babel": "npm:^3.0.3"
     "@storybook/react": "npm:^8.3.5"
     "@storybook/react-webpack5": "npm:^8.3.5"
-    "@tanstack/react-query": "npm:^4.16.1"
+    "@tanstack/react-query": "npm:^4.36.1"
     "@testing-library/react": "npm:~16.0.1"
     "@testing-library/user-event": "npm:~14.5.2"
-    "@types/jest": "npm:~29.5.12"
+    "@types/jest": "npm:~29.5.14"
     "@types/jest-axe": "npm:~3.5.9"
     "@types/react": "npm:~17.0.80"
     "@types/react-dom": "npm:~17.0.25"
@@ -10158,7 +10167,7 @@ __metadata:
     react: "npm:~17.0.2"
     react-i18next: "npm:~13.2.2"
     sip.js: "npm:^0.20.1"
-    storybook: "npm:^8.3.5"
+    storybook: "npm:^8.3.6"
     typescript: "npm:~5.6.3"
   peerDependencies:
     "@rocket.chat/css-in-js": "*"
@@ -10211,10 +10220,10 @@ __metadata:
     react: "npm:^17.0.2"
     react-beautiful-dnd: "npm:^13.1.1"
     react-dom: "npm:^17.0.2"
-    react-router-dom: "npm:^6.11.2"
+    react-router-dom: "npm:^6.27.0"
     react-split-pane: "npm:^0.1.92"
-    react-virtuoso: "npm:^4.7.1"
-    reactflow: "npm:^11.7.2"
+    react-virtuoso: "npm:^4.12.0"
+    reactflow: "npm:^11.11.4"
     typescript: "npm:~5.6.3"
     vite: "npm:^4.5.5"
   languageName: unknown
@@ -10241,7 +10250,7 @@ __metadata:
     "@storybook/react": "npm:^8.3.5"
     "@storybook/react-webpack5": "npm:^8.3.5"
     "@storybook/theming": "npm:^8.3.5"
-    "@tanstack/react-query": "npm:^4.16.1"
+    "@tanstack/react-query": "npm:^4.36.1"
     "@testing-library/react": "npm:~16.0.1"
     "@types/react": "npm:~17.0.80"
     babel-loader: "npm:~8.3.0"
@@ -10249,7 +10258,7 @@ __metadata:
     react: "npm:~17.0.2"
     react-hook-form: "npm:~7.45.4"
     react-i18next: "npm:~13.2.2"
-    storybook: "npm:^8.3.5"
+    storybook: "npm:^8.3.6"
     storybook-dark-mode: "npm:^4.0.2"
     typescript: "npm:~5.6.3"
   peerDependencies:
@@ -10814,9 +10823,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/core@npm:8.3.5":
-  version: 8.3.5
-  resolution: "@storybook/core@npm:8.3.5"
+"@storybook/core@npm:8.3.6":
+  version: 8.3.6
+  resolution: "@storybook/core@npm:8.3.6"
   dependencies:
     "@storybook/csf": "npm:^0.1.11"
     "@types/express": "npm:^4.17.21"
@@ -10831,7 +10840,7 @@ __metadata:
     semver: "npm:^7.6.2"
     util: "npm:^0.12.5"
     ws: "npm:^8.2.3"
-  checksum: 10/54daa08a779cd4ff314a9ef213c45f97ccb0805baec819a317ea166cd6a184776b42b5164da3f4c19c2bb2c8728cd58d0e86202048b50a63ec6d370271c622f0
+  checksum: 10/7163a919c6a1bb65acdfe28f7e8f3f481c982867f04bbf8bf8e98ef96e06da116d7ac1ca2442b6584e2b3a94521d8084082186f4632c44f50529ed7447956e5b
   languageName: node
   linkType: hard
 
@@ -11110,92 +11119,92 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-arm64@npm:1.7.26":
-  version: 1.7.26
-  resolution: "@swc/core-darwin-arm64@npm:1.7.26"
+"@swc/core-darwin-arm64@npm:1.7.39":
+  version: 1.7.39
+  resolution: "@swc/core-darwin-arm64@npm:1.7.39"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-x64@npm:1.7.26":
-  version: 1.7.26
-  resolution: "@swc/core-darwin-x64@npm:1.7.26"
+"@swc/core-darwin-x64@npm:1.7.39":
+  version: 1.7.39
+  resolution: "@swc/core-darwin-x64@npm:1.7.39"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm-gnueabihf@npm:1.7.26":
-  version: 1.7.26
-  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.7.26"
+"@swc/core-linux-arm-gnueabihf@npm:1.7.39":
+  version: 1.7.39
+  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.7.39"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-gnu@npm:1.7.26":
-  version: 1.7.26
-  resolution: "@swc/core-linux-arm64-gnu@npm:1.7.26"
+"@swc/core-linux-arm64-gnu@npm:1.7.39":
+  version: 1.7.39
+  resolution: "@swc/core-linux-arm64-gnu@npm:1.7.39"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-musl@npm:1.7.26":
-  version: 1.7.26
-  resolution: "@swc/core-linux-arm64-musl@npm:1.7.26"
+"@swc/core-linux-arm64-musl@npm:1.7.39":
+  version: 1.7.39
+  resolution: "@swc/core-linux-arm64-musl@npm:1.7.39"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-gnu@npm:1.7.26":
-  version: 1.7.26
-  resolution: "@swc/core-linux-x64-gnu@npm:1.7.26"
+"@swc/core-linux-x64-gnu@npm:1.7.39":
+  version: 1.7.39
+  resolution: "@swc/core-linux-x64-gnu@npm:1.7.39"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-musl@npm:1.7.26":
-  version: 1.7.26
-  resolution: "@swc/core-linux-x64-musl@npm:1.7.26"
+"@swc/core-linux-x64-musl@npm:1.7.39":
+  version: 1.7.39
+  resolution: "@swc/core-linux-x64-musl@npm:1.7.39"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@swc/core-win32-arm64-msvc@npm:1.7.26":
-  version: 1.7.26
-  resolution: "@swc/core-win32-arm64-msvc@npm:1.7.26"
+"@swc/core-win32-arm64-msvc@npm:1.7.39":
+  version: 1.7.39
+  resolution: "@swc/core-win32-arm64-msvc@npm:1.7.39"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-win32-ia32-msvc@npm:1.7.26":
-  version: 1.7.26
-  resolution: "@swc/core-win32-ia32-msvc@npm:1.7.26"
+"@swc/core-win32-ia32-msvc@npm:1.7.39":
+  version: 1.7.39
+  resolution: "@swc/core-win32-ia32-msvc@npm:1.7.39"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@swc/core-win32-x64-msvc@npm:1.7.26":
-  version: 1.7.26
-  resolution: "@swc/core-win32-x64-msvc@npm:1.7.26"
+"@swc/core-win32-x64-msvc@npm:1.7.39":
+  version: 1.7.39
+  resolution: "@swc/core-win32-x64-msvc@npm:1.7.39"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
-"@swc/core@npm:~1.7.26":
-  version: 1.7.26
-  resolution: "@swc/core@npm:1.7.26"
+"@swc/core@npm:~1.7.39":
+  version: 1.7.39
+  resolution: "@swc/core@npm:1.7.39"
   dependencies:
-    "@swc/core-darwin-arm64": "npm:1.7.26"
-    "@swc/core-darwin-x64": "npm:1.7.26"
-    "@swc/core-linux-arm-gnueabihf": "npm:1.7.26"
-    "@swc/core-linux-arm64-gnu": "npm:1.7.26"
-    "@swc/core-linux-arm64-musl": "npm:1.7.26"
-    "@swc/core-linux-x64-gnu": "npm:1.7.26"
-    "@swc/core-linux-x64-musl": "npm:1.7.26"
-    "@swc/core-win32-arm64-msvc": "npm:1.7.26"
-    "@swc/core-win32-ia32-msvc": "npm:1.7.26"
-    "@swc/core-win32-x64-msvc": "npm:1.7.26"
+    "@swc/core-darwin-arm64": "npm:1.7.39"
+    "@swc/core-darwin-x64": "npm:1.7.39"
+    "@swc/core-linux-arm-gnueabihf": "npm:1.7.39"
+    "@swc/core-linux-arm64-gnu": "npm:1.7.39"
+    "@swc/core-linux-arm64-musl": "npm:1.7.39"
+    "@swc/core-linux-x64-gnu": "npm:1.7.39"
+    "@swc/core-linux-x64-musl": "npm:1.7.39"
+    "@swc/core-win32-arm64-msvc": "npm:1.7.39"
+    "@swc/core-win32-ia32-msvc": "npm:1.7.39"
+    "@swc/core-win32-x64-msvc": "npm:1.7.39"
     "@swc/counter": "npm:^0.1.3"
-    "@swc/types": "npm:^0.1.12"
+    "@swc/types": "npm:^0.1.13"
   peerDependencies:
     "@swc/helpers": "*"
   dependenciesMeta:
@@ -11222,7 +11231,7 @@ __metadata:
   peerDependenciesMeta:
     "@swc/helpers":
       optional: true
-  checksum: 10/8fb43420bdd1b774dc054c6629f87f733e76860b97130609c7374f3a48406bc0ae1a2dd0b3e3c10317c692b2eaa64747f1a690b309727a8d1411112e2d2a884e
+  checksum: 10/8b719c6c5ccdf44940ec75889c2c78f6bba61e8226eea2c23f527a839826cf647faa7ea915ff92746cdeb0d64ea70b702d3329bdb91cd5e861059cbbd13c5a76
   languageName: node
   linkType: hard
 
@@ -11264,12 +11273,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@swc/types@npm:^0.1.12":
-  version: 0.1.12
-  resolution: "@swc/types@npm:0.1.12"
+"@swc/types@npm:^0.1.13":
+  version: 0.1.13
+  resolution: "@swc/types@npm:0.1.13"
   dependencies:
     "@swc/counter": "npm:^0.1.3"
-  checksum: 10/92dbbc70cd068ea30fb6fbdc1ae8599d6c058a5d09b2923d6e4e24fab5ad7c86a19dd01f349a8e03e300a9321e06911a24df18303b40e307fbd4109372cef2ef
+  checksum: 10/d0a50432917048cc69e30c82d1266e052a8e8d05ab202c5d74a5666be3748da4d2f99aaff46d91c0e3d285cf8f55270f8391cd578066fdecc3865733f8d5e14a
   languageName: node
   linkType: hard
 
@@ -11282,10 +11291,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tanstack/query-core@npm:4.15.1":
-  version: 4.15.1
-  resolution: "@tanstack/query-core@npm:4.15.1"
-  checksum: 10/59cd08fd4aa093049d7dccc77f0d97bef9709d6e0fa6f76dee719900ea70369fc001f2204494a14a14262f83e302fc6fafc3958fcbf8d3f86c70636b397ebb18
+"@tanstack/query-core@npm:4.36.1":
+  version: 4.36.1
+  resolution: "@tanstack/query-core@npm:4.36.1"
+  checksum: 10/7c648872cd491bcab2aa4c18e0b7ca130c072f05c277a5876977fa3bfa87634bbfde46e9d249236587d78c39866889a02e4e202b478dc6074ff96093732ae56d
   languageName: node
   linkType: hard
 
@@ -11304,11 +11313,11 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tanstack/react-query@npm:^4.16.1":
-  version: 4.16.1
-  resolution: "@tanstack/react-query@npm:4.16.1"
+"@tanstack/react-query@npm:^4.36.1":
+  version: 4.36.1
+  resolution: "@tanstack/react-query@npm:4.36.1"
   dependencies:
-    "@tanstack/query-core": "npm:4.15.1"
+    "@tanstack/query-core": "npm:4.36.1"
     use-sync-external-store: "npm:^1.2.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -11319,7 +11328,7 @@ __metadata:
       optional: true
     react-native:
       optional: true
-  checksum: 10/b296c487c94558ae0c2159b8bfd8bc30076af98e0a2472a061fa3af4fc4b0760368cdb55a6b6aff5c7c29395645b98b472551a089046219c0e36778d667e8753
+  checksum: 10/764b860c3ac8d254fc6b07e01054a0f58058644d59626c724b213293fbf1e31c198cbb26e4c32c0d16dcaec0353c0ae19147d9c667675b31f8cea1d64f1ff4ac
   languageName: node
   linkType: hard
 
@@ -12397,7 +12406,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/jest@npm:*, @types/jest@npm:~29.5.12, @types/jest@npm:~29.5.13, @types/jest@npm:~29.5.7":
+"@types/jest@npm:*":
   version: 29.5.13
   resolution: "@types/jest@npm:29.5.13"
   dependencies:
@@ -12407,6 +12416,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/jest@npm:~29.5.14":
+  version: 29.5.14
+  resolution: "@types/jest@npm:29.5.14"
+  dependencies:
+    expect: "npm:^29.0.0"
+    pretty-format: "npm:^29.0.0"
+  checksum: 10/59ec7a9c4688aae8ee529316c43853468b6034f453d08a2e1064b281af9c81234cec986be796288f1bbb29efe943bc950e70c8fa8faae1e460d50e3cf9760f9b
+  languageName: node
+  linkType: hard
+
 "@types/jquery@npm:*":
   version: 3.5.14
   resolution: "@types/jquery@npm:3.5.14"
@@ -14420,7 +14439,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ajv@npm:^8.0.0, ajv@npm:^8.0.1, ajv@npm:^8.11.0, ajv@npm:^8.8.0":
+"ajv@npm:^8.0.0, ajv@npm:^8.0.1, ajv@npm:^8.8.0":
   version: 8.12.0
   resolution: "ajv@npm:8.12.0"
   dependencies:
@@ -14432,7 +14451,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ajv@npm:^8.9.0":
+"ajv@npm:^8.17.1, ajv@npm:^8.9.0":
   version: 8.17.1
   resolution: "ajv@npm:8.17.1"
   dependencies:
@@ -16945,7 +16964,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cheerio@npm:1.0.0-rc.10, cheerio@npm:^1.0.0-rc.3":
+"cheerio@npm:1.0.0-rc.10":
   version: 1.0.0-rc.10
   resolution: "cheerio@npm:1.0.0-rc.10"
   dependencies:
@@ -18779,17 +18798,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"date-fns@npm:^2.15.0, date-fns@npm:^2.28.0":
-  version: 2.28.0
-  resolution: "date-fns@npm:2.28.0"
-  checksum: 10/2d99e884f7dc020971a394deef35cc4a2685cdf6c99585a79d64d271eb639e0e483f17948ec06c2820b01cc662b6e76b7be2aa3d671d530444447bf836cd40f8
-  languageName: node
-  linkType: hard
-
-"date-fns@npm:^3.3.1":
-  version: 3.3.1
-  resolution: "date-fns@npm:3.3.1"
-  checksum: 10/98231936765dfb6fc6897676319b500a06a39f051b2c3ecbdd541a07ce9b1344b770277b8bfb1049fb7a2f70bf365ac8e6f1e2bb452b10e1a8101d518ca7f95d
+"date-fns@npm:^2.30.0":
+  version: 2.30.0
+  resolution: "date-fns@npm:2.30.0"
+  dependencies:
+    "@babel/runtime": "npm:^7.21.0"
+  checksum: 10/70b3e8ea7aaaaeaa2cd80bd889622a4bcb5d8028b4de9162cbcda359db06e16ff6e9309e54eead5341e71031818497f19aaf9839c87d1aba1e27bb4796e758a9
   languageName: node
   linkType: hard
 
@@ -19527,7 +19541,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"domhandler@npm:^3.0.0":
+"domhandler@npm:^3.3.0":
   version: 3.3.0
   resolution: "domhandler@npm:3.3.0"
   dependencies:
@@ -19578,7 +19592,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"domutils@npm:^2.0.0, domutils@npm:^2.5.2, domutils@npm:^2.8.0":
+"domutils@npm:^2.4.2, domutils@npm:^2.5.2, domutils@npm:^2.8.0":
   version: 2.8.0
   resolution: "domutils@npm:2.8.0"
   dependencies:
@@ -21314,7 +21328,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"express@npm:^4.16.4, express@npm:^4.17.3":
+"express@npm:^4.16.4":
   version: 4.18.2
   resolution: "express@npm:4.18.2"
   dependencies:
@@ -21353,7 +21367,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"express@npm:^4.18.1, express@npm:^4.18.2, express@npm:^4.19.2":
+"express@npm:^4.18.1, express@npm:^4.18.2, express@npm:^4.19.2, express@npm:^4.21.1":
   version: 4.21.1
   resolution: "express@npm:4.21.1"
   dependencies:
@@ -23325,10 +23339,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"highlight.js@npm:^11.5.1, highlight.js@npm:^11.6.0":
-  version: 11.6.0
-  resolution: "highlight.js@npm:11.6.0"
-  checksum: 10/7ba8a09e9388f1495b3123ac2c0d12557ae43dd14746aff024db7555b22b6ff5cf1f5124bd0f5127a21af79fcbfea58547f9e8c428ded85a2a6dd5b64d47417b
+"highlight.js@npm:^11.10.0":
+  version: 11.10.0
+  resolution: "highlight.js@npm:11.10.0"
+  checksum: 10/fc8747bcd4a491fc6a47ff80536881dcc9ea9b36cdc2a22a7be5670b89d76ca6c26df9d749017a23bbb2eb708331097a5ecbcee6330fb9064512d80cc3369d99
   languageName: node
   linkType: hard
 
@@ -23584,15 +23598,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"htmlparser2@npm:^4.0.0":
-  version: 4.1.0
-  resolution: "htmlparser2@npm:4.1.0"
+"htmlparser2@npm:^5.0.0":
+  version: 5.0.1
+  resolution: "htmlparser2@npm:5.0.1"
   dependencies:
     domelementtype: "npm:^2.0.1"
-    domhandler: "npm:^3.0.0"
-    domutils: "npm:^2.0.0"
+    domhandler: "npm:^3.3.0"
+    domutils: "npm:^2.4.2"
     entities: "npm:^2.0.0"
-  checksum: 10/e8ed0d9a4cae2d8d311e7f1d4ca2008c89b3fb20f864e30e77fe63182e671912fcd8d1c7a5780c515cec32d539553a5cb31d1f0802730cd107107b58ae657458
+  checksum: 10/789904b9a9f3d2f2d6b63e32aeb8b4cc03d6f5f751c5db86fbdf32c83570f5a5fc827fe664701ec4c5f940c49cf73ceffc93658ce116225f949e29a67dcc8629
   languageName: node
   linkType: hard
 
@@ -26482,18 +26496,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"juice@npm:^8.0.0":
-  version: 8.0.0
-  resolution: "juice@npm:8.0.0"
+"juice@npm:^8.1.0":
+  version: 8.1.0
+  resolution: "juice@npm:8.1.0"
   dependencies:
-    cheerio: "npm:^1.0.0-rc.3"
+    cheerio: "npm:1.0.0-rc.10"
     commander: "npm:^6.1.0"
     mensch: "npm:^0.3.4"
     slick: "npm:^1.12.2"
-    web-resource-inliner: "npm:^5.0.0"
+    web-resource-inliner: "npm:^6.0.1"
   bin:
     juice: bin/juice
-  checksum: 10/a28269f34912bd6acad49585cd5e2067e0f7cab47b37b98b559fe9bb115e5969ce5de59ecb5959e099a396788d0aa00a951e48cf0bfd54c4db2880a7e2d352a9
+  checksum: 10/595fa7e449a72335cb62170bf6ff7d54c52d3d966210ffb6c6dd210d70831a5c9c9798e1289b53ba303313e780685d3f9053c11013c6773e4c6fb9afec81d323
   languageName: node
   linkType: hard
 
@@ -30657,13 +30671,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pino-abstract-transport@npm:v1.0.0":
-  version: 1.0.0
-  resolution: "pino-abstract-transport@npm:1.0.0"
+"pino-abstract-transport@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "pino-abstract-transport@npm:1.2.0"
   dependencies:
     readable-stream: "npm:^4.0.0"
     split2: "npm:^4.0.0"
-  checksum: 10/9241490465d7ebeaf842eb866cb884abbe8a7e24b12439b9b09e57bd0bb0fb94951059374f3cea69c12e12129efed0734b254b8485fcab9988cc7f4d69085f6f
+  checksum: 10/6ec1d19a7ff3347fd21576f744c31c3e38ca4463ae638818408f43698c936f96be6a0bc750af5f7c1ae81873183bfcb062b7a0d12dc159a1813ea900c388c693
   languageName: node
   linkType: hard
 
@@ -30697,24 +30711,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pino@npm:^8.15.0":
-  version: 8.15.0
-  resolution: "pino@npm:8.15.0"
+"pino@npm:^8.21.0":
+  version: 8.21.0
+  resolution: "pino@npm:8.21.0"
   dependencies:
     atomic-sleep: "npm:^1.0.0"
     fast-redact: "npm:^3.1.1"
     on-exit-leak-free: "npm:^2.1.0"
-    pino-abstract-transport: "npm:v1.0.0"
+    pino-abstract-transport: "npm:^1.2.0"
     pino-std-serializers: "npm:^6.0.0"
-    process-warning: "npm:^2.0.0"
+    process-warning: "npm:^3.0.0"
     quick-format-unescaped: "npm:^4.0.3"
     real-require: "npm:^0.2.0"
     safe-stable-stringify: "npm:^2.3.1"
-    sonic-boom: "npm:^3.1.0"
-    thread-stream: "npm:^2.0.0"
+    sonic-boom: "npm:^3.7.0"
+    thread-stream: "npm:^2.6.0"
   bin:
     pino: bin.js
-  checksum: 10/be635068a214261a8183331bd360c3e01ebed2ed01919694a64271549d4accc6163d470de85be8d54de9144ff90a83520021c0f1530999c283ee9de13143864c
+  checksum: 10/5a054eab533ab91b20f63497b86070f0a6b40e4688cde9de66d23e03d6046c4e95d69c3f526dea9f30bcbc5874c7fbf0f91660cded4753946fd02261ca8ac340
   languageName: node
   linkType: hard
 
@@ -31604,10 +31618,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"preact@npm:~10.24.2":
-  version: 10.24.2
-  resolution: "preact@npm:10.24.2"
-  checksum: 10/12b13122ccddb06533daef5ff00ddd4c6a4307f008a235c0b006e72a63c99a33403428f76e8e5e184af8daec344c10a26ce082fb07a62d7c4d6383e9f8e71ee4
+"preact@npm:~10.24.3":
+  version: 10.24.3
+  resolution: "preact@npm:10.24.3"
+  checksum: 10/e9c4c901a4ddd475a1072355b5c6c944b05797445e0d68f317ad0dbc976b831523573693ea75d2e12e7902042e3729af435377816d25558bf693ecf6b516c707
   languageName: node
   linkType: hard
 
@@ -31762,10 +31776,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"process-warning@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "process-warning@npm:2.0.0"
-  checksum: 10/efbf769c41898ec68d57a523cbde5a8c1e792261a36362129c9788101342aac85b4cb8261448165d0a4b78115f9c7bc827f3a98d193bca86c8d67c7412dbe272
+"process-warning@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "process-warning@npm:3.0.0"
+  checksum: 10/2d82fa641e50a5789eaf0f2b33453760996e373d4591aac576a22d696186ab7e240a0592db86c264d4f28a46c2abbe9b94689752017db7dadc90f169f12b0924
   languageName: node
   linkType: hard
 
@@ -32405,13 +32419,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"re-resizable@npm:^6.9.18":
-  version: 6.9.18
-  resolution: "re-resizable@npm:6.9.18"
+"re-resizable@npm:^6.10.0":
+  version: 6.10.0
+  resolution: "re-resizable@npm:6.10.0"
   peerDependencies:
     react: ^16.13.1 || ^17.0.0 || ^18.0.0
     react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0
-  checksum: 10/cdb2ee8544a2b30053af5cc74ccf56e8d3e470e8e0ed8572424049297cf234d002870dd56c13ce352f222d0dbbc53830c6d07d2cabc83b7aa0311a21361160bf
+  checksum: 10/303e582feffdfd3e491e2b51dc75c8641c726882e2d8e3ec249b2bc1d23bfffa73bd4a982ed5456bcab9ec25f52b5430e8c632f32647295ed773679691a961a2
   languageName: node
   linkType: hard
 
@@ -32692,27 +32706,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-router-dom@npm:^6.11.2":
-  version: 6.11.2
-  resolution: "react-router-dom@npm:6.11.2"
+"react-router-dom@npm:^6.27.0":
+  version: 6.27.0
+  resolution: "react-router-dom@npm:6.27.0"
   dependencies:
-    "@remix-run/router": "npm:1.6.2"
-    react-router: "npm:6.11.2"
+    "@remix-run/router": "npm:1.20.0"
+    react-router: "npm:6.27.0"
   peerDependencies:
     react: ">=16.8"
     react-dom: ">=16.8"
-  checksum: 10/85575793cbdb84b05e9c33fef6f81e6b09e9f2606d2ba03392f83689dbb240212e5b22634b95049fc19364e9b44d45a519387d1bff4eba8a163548aa3376bc0f
+  checksum: 10/cfbcbc1d387d3341a335e3a075e487cc09dcbb62f1b83bc827fc3eec937523d5647a2c4488c804dc61581e65561823d0166d17b5dbc8579998c25b5a0bcabad6
   languageName: node
   linkType: hard
 
-"react-router@npm:6.11.2":
-  version: 6.11.2
-  resolution: "react-router@npm:6.11.2"
+"react-router@npm:6.27.0":
+  version: 6.27.0
+  resolution: "react-router@npm:6.27.0"
   dependencies:
-    "@remix-run/router": "npm:1.6.2"
+    "@remix-run/router": "npm:1.20.0"
   peerDependencies:
     react: ">=16.8"
-  checksum: 10/a40d1ea78e3b5b3167ed6cbaf74b2e60592fd1822b9f94a2499933bf699130a81f669bc06bdf34f38489a96d31510848c21254a48e49038b18ecbf42993eaa34
+  checksum: 10/352e3af2075cdccf9d114b7e06d94a1b46a2147ba9d6e8643787a92464f5fd9ead950252a98d551f99f21860288bcf3a4f088cb5f46b28d1274a4e2ba24cc0f9
   languageName: node
   linkType: hard
 
@@ -32779,13 +32793,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-virtuoso@npm:^4.7.1":
-  version: 4.7.1
-  resolution: "react-virtuoso@npm:4.7.1"
+"react-virtuoso@npm:^4.12.0":
+  version: 4.12.0
+  resolution: "react-virtuoso@npm:4.12.0"
   peerDependencies:
     react: ">=16 || >=17 || >= 18"
     react-dom: ">=16 || >=17 || >= 18"
-  checksum: 10/c223ef8af0d2186c5469f3a512ad68f98c86e39572e220607e0ff0e441a5b03ea238f0075f183de30c6f3e8d0c42a6af8c8e5a555f1c1122141bf65386e31189
+  checksum: 10/f9d899dc7747e475efb793b849de9bac4f71209f3a74238a4d58d7c0c81543cca35179d64029f014fb6ebad2eab18d9a852444a49c8fe7c5177a18f09b9924d4
   languageName: node
   linkType: hard
 
@@ -32808,20 +32822,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"reactflow@npm:^11.7.2":
-  version: 11.7.2
-  resolution: "reactflow@npm:11.7.2"
+"reactflow@npm:^11.11.4":
+  version: 11.11.4
+  resolution: "reactflow@npm:11.11.4"
   dependencies:
-    "@reactflow/background": "npm:11.2.2"
-    "@reactflow/controls": "npm:11.1.13"
-    "@reactflow/core": "npm:11.7.2"
-    "@reactflow/minimap": "npm:11.5.2"
-    "@reactflow/node-resizer": "npm:2.1.0"
-    "@reactflow/node-toolbar": "npm:1.2.1"
+    "@reactflow/background": "npm:11.3.14"
+    "@reactflow/controls": "npm:11.2.14"
+    "@reactflow/core": "npm:11.11.4"
+    "@reactflow/minimap": "npm:11.7.14"
+    "@reactflow/node-resizer": "npm:2.2.14"
+    "@reactflow/node-toolbar": "npm:1.3.14"
   peerDependencies:
     react: ">=17"
     react-dom: ">=17"
-  checksum: 10/024f413cbfc00fb334a3a514d65fe58c5688f5b8c402afcb98d3ca9d4b9631a520247b757bda15d377bd7b8ec4fb80a8ce24f6332d13546c1760d53e4cae5413
+  checksum: 10/d3322b9971d69762ee4afe5eab16c3d9a2cd362923ad2385d3751ba51f0081a91100c7018597ee0b5eee4b3037ae8ccbded0a27c1bac711252197d8eeaebbe40
   languageName: node
   linkType: hard
 
@@ -33793,7 +33807,7 @@ __metadata:
     "@types/fibers": "npm:^3.1.4"
     "@types/node": "npm:~20.16.12"
     "@types/ws": "npm:^8.5.12"
-    ajv: "npm:^8.11.0"
+    ajv: "npm:^8.17.1"
     bcrypt: "npm:^5.0.1"
     body-parser: "npm:^1.20.3"
     colorette: "npm:^2.0.20"
@@ -33801,14 +33815,14 @@ __metadata:
     cookie-parser: "npm:^1.4.7"
     ejson: "npm:^2.2.3"
     eventemitter3: "npm:^4.0.7"
-    express: "npm:^4.17.3"
+    express: "npm:^4.21.1"
     jaeger-client: "npm:^3.19.0"
     mem: "npm:^8.1.1"
     moleculer: "npm:^0.14.34"
     mongodb: "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch"
     nats: "npm:^2.6.1"
     npm-run-all: "npm:^4.1.5"
-    pino: "npm:^8.15.0"
+    pino: "npm:^8.21.0"
     pino-pretty: "npm:^7.6.1"
     sodium-native: "npm:^3.3.0"
     sodium-plus: "npm:^0.9.0"
@@ -33986,9 +34000,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sass@npm:~1.79.5":
-  version: 1.79.5
-  resolution: "sass@npm:1.79.5"
+"sass@npm:~1.80.4":
+  version: 1.80.4
+  resolution: "sass@npm:1.80.4"
   dependencies:
     "@parcel/watcher": "npm:^2.4.1"
     chokidar: "npm:^4.0.0"
@@ -33996,7 +34010,7 @@ __metadata:
     source-map-js: "npm:>=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: 10/86f6ebe9c3c8d86cf8fff2e12f93109697140090604fb6180c8792c0e4fc98377c433dbd4c86a0272c47ba4c307edf24435a06d7e5995956048a23f9e187fedc
+  checksum: 10/a30d5c2313eda3e9100bfd00fd51fc030cfe7611c492268473ec0fd718180503cdebc23f7237bd61405ef6e653937d7bb972df7dcf4dffeef4f47fd9951f081e
   languageName: node
   linkType: hard
 
@@ -34798,12 +34812,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sonic-boom@npm:^3.1.0":
-  version: 3.2.0
-  resolution: "sonic-boom@npm:3.2.0"
+"sonic-boom@npm:^3.7.0":
+  version: 3.8.1
+  resolution: "sonic-boom@npm:3.8.1"
   dependencies:
     atomic-sleep: "npm:^1.0.0"
-  checksum: 10/fffbb58d32e7db90778bb17b6864ca8701681175cd3d305d5d4dc8c06c833703c83f2ea73a6b615325408c609255ac0a229e3a1bca643d1bb4b53ea944ab0238
+  checksum: 10/e03c9611e43fa81132cd2ce0fe4eb7fbcf19db267e9dec20dc6c586f82465c9c906e91a02f72150c740463ad9335536ea2131850307aaa6686d1fb5d4cc4be3e
   languageName: node
   linkType: hard
 
@@ -35234,16 +35248,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"storybook@npm:^8.3.5":
-  version: 8.3.5
-  resolution: "storybook@npm:8.3.5"
+"storybook@npm:^8.3.6":
+  version: 8.3.6
+  resolution: "storybook@npm:8.3.6"
   dependencies:
-    "@storybook/core": "npm:8.3.5"
+    "@storybook/core": "npm:8.3.6"
   bin:
     getstorybook: ./bin/index.cjs
     sb: ./bin/index.cjs
     storybook: ./bin/index.cjs
-  checksum: 10/66ecb201522598902e363a7e14d6e5f4bf1bba77ea640de6b7431e1a7564dfe8a5f359da9f8b382d376989bf7a50bb0cdb665143ba609cdf16c21687e5183533
+  checksum: 10/b980e90297c918e68dc31ea126780a30ba29076a99921a2558d61cae26491f24f0bc494d6c3aff68d587397d25d1224496df91e76fc6f2a0616f7d97ab9fd46a
   languageName: node
   linkType: hard
 
@@ -36449,12 +36463,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"thread-stream@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "thread-stream@npm:2.1.0"
+"thread-stream@npm:^2.6.0":
+  version: 2.7.0
+  resolution: "thread-stream@npm:2.7.0"
   dependencies:
     real-require: "npm:^0.2.0"
-  checksum: 10/1a579efa782fa4f1df7cdbedf4e70d4c463cbe1d9a775521cd278ee595a540935d4420cf604c33a1249cb61d82df70d1159bcffa0ec43f874766203b351fa9bf
+  checksum: 10/03e743a2ccb2af5fa695d2e4369113336ee9b9f09c4453d50a222cbb4ae3af321bff658e0e5bf8bfbce9d7f5a7bf6262d12a2a365e160f4e76380ec624d32e7b
   languageName: node
   linkType: hard
 
@@ -38032,16 +38046,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"use-sync-external-store@npm:1.2.0":
-  version: 1.2.0
-  resolution: "use-sync-external-store@npm:1.2.0"
-  peerDependencies:
-    react: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 10/a676216affc203876bd47981103f201f28c2731361bb186367e12d287a7566763213a8816910c6eb88265eccd4c230426eb783d64c373c4a180905be8820ed8e
-  languageName: node
-  linkType: hard
-
-"use-sync-external-store@npm:^1.2.0, use-sync-external-store@npm:^1.2.2, use-sync-external-store@npm:~1.2.0, use-sync-external-store@npm:~1.2.2":
+"use-sync-external-store@npm:1.2.2, use-sync-external-store@npm:^1.2.0, use-sync-external-store@npm:^1.2.2, use-sync-external-store@npm:~1.2.0, use-sync-external-store@npm:~1.2.2":
   version: 1.2.2
   resolution: "use-sync-external-store@npm:1.2.2"
   peerDependencies:
@@ -38452,17 +38457,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"web-resource-inliner@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "web-resource-inliner@npm:5.0.0"
+"web-resource-inliner@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "web-resource-inliner@npm:6.0.1"
   dependencies:
     ansi-colors: "npm:^4.1.1"
     escape-goat: "npm:^3.0.0"
-    htmlparser2: "npm:^4.0.0"
+    htmlparser2: "npm:^5.0.0"
     mime: "npm:^2.4.6"
     node-fetch: "npm:^2.6.0"
     valid-data-url: "npm:^3.0.0"
-  checksum: 10/93428b0c95ff757db825d0d13fd69a2676c16a391693ff81d7eacaefe0f8f08afcf5c6744f5b3e83ad716e998d4a7695522e3b7c8a806840cd0547fe2226d921
+  checksum: 10/179ee600b6d73d889ff4a9944553b6096384b837f97b75cddde3a15bb8847a6116d4bfc4bd54ca171bd34f81cb7c8b669162433207fb748f3e2704e63e3a97f9
   languageName: node
   linkType: hard
 
@@ -39603,20 +39608,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"zustand@npm:^4.3.1":
-  version: 4.3.8
-  resolution: "zustand@npm:4.3.8"
+"zustand@npm:^4.4.1":
+  version: 4.5.5
+  resolution: "zustand@npm:4.5.5"
   dependencies:
-    use-sync-external-store: "npm:1.2.0"
+    use-sync-external-store: "npm:1.2.2"
   peerDependencies:
-    immer: ">=9.0"
+    "@types/react": ">=16.8"
+    immer: ">=9.0.6"
     react: ">=16.8"
   peerDependenciesMeta:
+    "@types/react":
+      optional: true
     immer:
       optional: true
     react:
       optional: true
-  checksum: 10/95a5335716414c8bef3a48165226ef099ca232931ab6cd1497515ee4241e8d5a8100edf5c3cc7d7131b72a07eb0484501405aa2c3222b4b93ba690cfa2b5593d
+  checksum: 10/481b8210187b69678074a1ca51107654c2379688e90407bfcb7961e0803a259742bfd0d77171c3f07e290896ad55fe9659b3863f30d34cb2572650ead1249f25
   languageName: node
   linkType: hard
 

From 465c8b8b8a64ff80556c23913a0bd82a499e6ffa Mon Sep 17 00:00:00 2001
From: Anirban Singha <143536290+SinghaAnirban005@users.noreply.github.com>
Date: Sun, 27 Oct 2024 00:59:22 +0530
Subject: [PATCH 22/22] docs: Update Node.js Version to 20.x (LTS) in
 Development Environment Setup Instructions (#33804)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 564ca75d2b11..072758e5524b 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ Free for 30 days. Afterward, choose between continuing to host on our secure clo
 
 You can follow these instructions to setup a dev environment:
 
-- Install **Node 14.x (LTS)** either [manually](https://nodejs.org/dist/latest-v14.x/) or using a tool like [nvm](https://github.com/creationix/nvm) or [volta](https://volta.sh/) (recommended)
+- Install **Node 20.x (LTS)** either [manually](https://nodejs.org/dist/latest-v20.x/) or using a tool like [nvm](https://github.com/creationix/nvm) or [volta](https://volta.sh/) (recommended)
 - Install **Meteor** ([version here](apps/meteor/.meteor/release)): https://docs.meteor.com/about/install.html
 - Install **yarn**: https://yarnpkg.com/getting-started/install
 - Install **Deno 1.x**: https://docs.deno.com/runtime/fundamentals/installation/